diff --git a/.env.dev.example b/.env.dev.example index 3cba06ab4..f42aaaaec 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -2,7 +2,8 @@ SECRET_KEY="7(2w1sedok=aznpq)ta1mc4i%4h=xx@hxwx*o57ctsuml0x%fr" # SECURITY WARNING: don't run with debug turned on in production! -DEBUG=false +DEBUG=true +USE_HTTPS=false DOMAIN=your.domain.here #EMAIL=your@email.here @@ -42,6 +43,21 @@ EMAIL_HOST_PASSWORD=emailpassword123 EMAIL_USE_TLS=true EMAIL_USE_SSL=false +# S3 configuration +USE_S3=false +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= + +# Commented are example values if you use a non-AWS, S3-compatible service +# AWS S3 should work with only AWS_STORAGE_BUCKET_NAME and AWS_S3_REGION_NAME +# non-AWS S3-compatible services will need AWS_STORAGE_BUCKET_NAME, +# along with both AWS_S3_CUSTOM_DOMAIN and AWS_S3_ENDPOINT_URL + +# AWS_STORAGE_BUCKET_NAME= # "example-bucket-name" +# AWS_S3_CUSTOM_DOMAIN=None # "example-bucket-name.s3.fr-par.scw.cloud" +# AWS_S3_REGION_NAME=None # "fr-par" +# AWS_S3_ENDPOINT_URL=None # "https://s3.fr-par.scw.cloud" + # Preview image generation can be computing and storage intensive # ENABLE_PREVIEW_IMAGES=True diff --git a/.env.prod.example b/.env.prod.example index d61c46af5..5115469ca 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -3,6 +3,7 @@ SECRET_KEY="7(2w1sedok=aznpq)ta1mc4i%4h=xx@hxwx*o57ctsuml0x%fr" # SECURITY WARNING: don't run with debug turned on in production! DEBUG=false +USE_HTTPS=true DOMAIN=your.domain.here EMAIL=your@email.here @@ -42,6 +43,21 @@ EMAIL_HOST_PASSWORD=emailpassword123 EMAIL_USE_TLS=true EMAIL_USE_SSL=false +# S3 configuration +USE_S3=false +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= + +# Commented are example values if you use a non-AWS, S3-compatible service +# AWS S3 should work with only AWS_STORAGE_BUCKET_NAME and AWS_S3_REGION_NAME +# non-AWS S3-compatible services will need AWS_STORAGE_BUCKET_NAME, +# along with both AWS_S3_CUSTOM_DOMAIN and AWS_S3_ENDPOINT_URL + +# AWS_STORAGE_BUCKET_NAME= # "example-bucket-name" +# AWS_S3_CUSTOM_DOMAIN=None # "example-bucket-name.s3.fr-par.scw.cloud" +# AWS_S3_REGION_NAME=None # "fr-par" +# AWS_S3_ENDPOINT_URL=None # "https://s3.fr-par.scw.cloud" + # Preview image generation can be computing and storage intensive # ENABLE_PREVIEW_IMAGES=True diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index fb681dcd5..7258b6087 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -1,6 +1,10 @@ name: Python Formatting (run ./bw-dev black to fix) -on: [push, pull_request] +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] jobs: lint: diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index c11b7c408..038751935 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -9,18 +9,9 @@ jobs: build: runs-on: ubuntu-20.04 - strategy: - max-parallel: 4 - matrix: - db: [postgres] - python-version: [3.9] - include: - - db: postgres - db_port: 5432 - services: postgres: - image: postgres:12 + image: postgres:13 env: POSTGRES_USER: postgres POSTGRES_PASSWORD: hunter2 @@ -33,22 +24,19 @@ jobs: - 5432:5432 steps: - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: 3.9 - name: Install Dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt - name: Run Tests env: - DB: ${{ matrix.db }} - DB_HOST: 127.0.0.1 - DB_PORT: ${{ matrix.db_port }} - DB_PASSWORD: hunter2 SECRET_KEY: beepbeep - DEBUG: true + DEBUG: false + USE_HTTPS: true DOMAIN: your.domain.here BOOKWYRM_DATABASE_BACKEND: postgres MEDIA_ROOT: images/ @@ -64,6 +52,6 @@ jobs: EMAIL_HOST_USER: "" EMAIL_HOST_PASSWORD: "" EMAIL_USE_TLS: true - ENABLE_PREVIEW_IMAGES: true + ENABLE_PREVIEW_IMAGES: false run: | - pytest + pytest -n 3 diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 1a32940f9..1b14149f2 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -1,6 +1,10 @@ name: Pylint -on: [push, pull_request] +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] jobs: build: diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 81762388f..da32fbaf1 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -106,6 +106,7 @@ class ActivityObject: value = field.default setattr(self, field.name, value) + # pylint: disable=too-many-locals,too-many-branches def to_model(self, model=None, instance=None, allow_create=True, save=True): """convert from an activity to a model instance""" model = model or get_model_from_type(self.type) @@ -126,27 +127,36 @@ class ActivityObject: return None instance = instance or model() + # keep track of what we've changed + update_fields = [] for field in instance.simple_fields: try: - field.set_field_from_activity(instance, self) + changed = field.set_field_from_activity(instance, self) + if changed: + update_fields.append(field.name) 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 for field in instance.image_fields: - field.set_field_from_activity(instance, self, save=save) + changed = field.set_field_from_activity(instance, self, save=save) + if changed: + update_fields.append(field.name) if not save: return instance with transaction.atomic(): + # can't force an update on fields unless the object already exists in the db + if not instance.id: + update_fields = None # we can't set many to many and reverse fields on an unsaved object try: try: - instance.save(broadcast=False) + instance.save(broadcast=False, update_fields=update_fields) except TypeError: - instance.save() + instance.save(update_fields=update_fields) except IntegrityError as e: raise ActivitySerializerError(e) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index a49a7ce4d..bad7c59f8 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -4,11 +4,12 @@ from django.db.models import signals, Q from bookwyrm import models from bookwyrm.redis_store import RedisStore, r +from bookwyrm.settings import STREAMS 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, books)""" def stream_id(self, user): """the redis key for this user's instance of this stream""" @@ -155,29 +156,94 @@ class LocalStream(ActivityStream): ) -class FederatedStream(ActivityStream): - """users you follow""" +class BooksStream(ActivityStream): + """books on your shelves""" - key = "federated" + key = "books" def get_audience(self, status): - # this stream wants no part in non-public statuses - if status.privacy != "public": + """anyone with the mentioned book on their shelves""" + # only show public statuses on the books feed, + # and only statuses that mention books + if status.privacy != "public" or not ( + status.mention_books.exists() or hasattr(status, "book") + ): return [] - return super().get_audience(status) + + work = ( + status.book.parent_work + if hasattr(status, "book") + else status.mention_books.first().parent_work + ) + + audience = super().get_audience(status) + if not audience: + return [] + return audience.filter(shelfbook__book__parent_work=work).distinct() def get_statuses_for_user(self, user): + """any public status that mentions the user's books""" + books = user.shelfbook_set.values_list( + "book__parent_work__id", flat=True + ).distinct() return privacy_filter( user, - models.Status.objects.select_subclasses(), + models.Status.objects.select_subclasses() + .filter( + Q(comment__book__parent_work__id__in=books) + | Q(quotation__book__parent_work__id__in=books) + | Q(review__book__parent_work__id__in=books) + | Q(mention_books__parent_work__id__in=books) + ) + .distinct(), privacy_levels=["public"], ) + def add_book_statuses(self, user, book): + """add statuses about a book to a user's feed""" + work = book.parent_work + statuses = privacy_filter( + user, + models.Status.objects.select_subclasses() + .filter( + Q(comment__book__parent_work=work) + | Q(quotation__book__parent_work=work) + | Q(review__book__parent_work=work) + | Q(mention_books__parent_work=work) + ) + .distinct(), + privacy_levels=["public"], + ) + self.bulk_add_objects_to_store(statuses, self.stream_id(user)) + def remove_book_statuses(self, user, book): + """add statuses about a book to a user's feed""" + work = book.parent_work + statuses = privacy_filter( + user, + models.Status.objects.select_subclasses() + .filter( + Q(comment__book__parent_work=work) + | Q(quotation__book__parent_work=work) + | Q(review__book__parent_work=work) + | Q(mention_books__parent_work=work) + ) + .distinct(), + privacy_levels=["public"], + ) + self.bulk_remove_objects_from_store(statuses, self.stream_id(user)) + + +# determine which streams are enabled in settings.py +available_streams = [s["key"] for s in STREAMS] streams = { - "home": HomeStream(), - "local": LocalStream(), - "federated": FederatedStream(), + k: v + for (k, v) in { + "home": HomeStream(), + "local": LocalStream(), + "books": BooksStream(), + }.items() + if k in available_streams } @@ -197,7 +263,6 @@ def add_status_on_create(sender, instance, created, *args, **kwargs): if not created: return - # iterates through Home, Local, Federated for stream in streams.values(): stream.add_status(instance) @@ -264,7 +329,7 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs): # pylint: disable=unused-argument def add_statuses_on_unblock(sender, instance, *args, **kwargs): """remove statuses from all feeds on block""" - public_streams = [LocalStream(), FederatedStream()] + public_streams = [v for (k, v) in streams.items() if k != "home"] # add statuses back to streams with statuses from anyone if instance.user_subject.local: for stream in public_streams: @@ -285,3 +350,33 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg for stream in streams.values(): stream.populate_streams(instance) + + +@receiver(signals.pre_save, sender=models.ShelfBook) +# pylint: disable=unused-argument +def add_statuses_on_shelve(sender, instance, *args, **kwargs): + """update books stream when user shelves a book""" + if not instance.user.local: + return + # check if the book is already on the user's shelves + if models.ShelfBook.objects.filter( + user=instance.user, book__in=instance.book.parent_work.editions.all() + ).exists(): + return + + BooksStream().add_book_statuses(instance.user, instance.book) + + +@receiver(signals.post_delete, sender=models.ShelfBook) +# pylint: disable=unused-argument +def remove_statuses_on_shelve(sender, instance, *args, **kwargs): + """update books stream when user unshelves a book""" + if not instance.user.local: + return + # check if the book is actually unshelved, not just moved + if models.ShelfBook.objects.filter( + user=instance.user, book__in=instance.book.parent_work.editions.all() + ).exists(): + return + + BooksStream().remove_book_statuses(instance.user, instance.book) diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index f2661a193..1f0387fe7 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -11,10 +11,7 @@ def site_settings(request): # pylint: disable=unused-argument return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "static_url": settings.STATIC_URL, - "media_url": settings.MEDIA_URL, - "static_path": settings.STATIC_PATH, - "media_path": settings.MEDIA_PATH, + "media_full_url": settings.MEDIA_FULL_URL, "preview_images_enabled": settings.ENABLE_PREVIEW_IMAGES, "request_protocol": request_protocol, } diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py index 657310b05..fff3985ef 100644 --- a/bookwyrm/emailing.py +++ b/bookwyrm/emailing.py @@ -23,6 +23,14 @@ def email_data(): } +def email_confirmation_email(user): + """newly registered users confirm email address""" + data = email_data() + data["confirmation_code"] = user.confirmation_code + data["confirmation_link"] = user.confirmation_link + send_email.delay(user.email, *format_email("confirm", data)) + + def invite_email(invite_request): """send out an invite code""" data = email_data() diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index 57a94e3cd..c9e795c3e 100644 --- a/bookwyrm/forms.py +++ b/bookwyrm/forms.py @@ -132,6 +132,7 @@ class EditUserForm(CustomForm): "summary", "show_goal", "manually_approves_followers", + "default_post_privacy", "discoverable", "preferred_timezone", ] diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 203db0343..d5f1449ca 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -2,6 +2,8 @@ import csv import logging +from django.utils import timezone + from bookwyrm import models from bookwyrm.models import ImportJob, ImportItem from bookwyrm.tasks import app @@ -100,7 +102,10 @@ def handle_imported_book(source, user, item, include_reviews, privacy): # 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) + shelved_date = item.date_added or timezone.now() + models.ShelfBook.objects.create( + book=item.book, shelf=desired_shelf, user=user, shelved_date=shelved_date + ) for read in item.reads: # check for an existing readthrough with the same dates diff --git a/bookwyrm/management/commands/populate_streams.py b/bookwyrm/management/commands/populate_streams.py index 85b71b87c..f8aa21a52 100644 --- a/bookwyrm/management/commands/populate_streams.py +++ b/bookwyrm/management/commands/populate_streams.py @@ -1,16 +1,6 @@ """ Re-create user streams """ 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, - password=settings.REDIS_ACTIVITY_PASSWORD, - unix_socket_path=settings.REDIS_ACTIVITY_SOCKET, - db=0, -) +from bookwyrm import activitystreams, models def populate_streams(): diff --git a/bookwyrm/management/commands/populate_suggestions.py b/bookwyrm/management/commands/populate_suggestions.py new file mode 100644 index 000000000..32495497e --- /dev/null +++ b/bookwyrm/management/commands/populate_suggestions.py @@ -0,0 +1,25 @@ +""" Populate suggested users """ +from django.core.management.base import BaseCommand + +from bookwyrm import models +from bookwyrm.suggested_users import rerank_suggestions_task + + +def populate_suggestions(): + """build all the streams for all the users""" + users = models.User.objects.filter( + local=True, + is_active=True, + ).values_list("id", flat=True) + for user in users: + rerank_suggestions_task.delay(user) + + +class Command(BaseCommand): + """start all over with user suggestions""" + + help = "Populate suggested users for all users" + # pylint: disable=no-self-use,unused-argument + def handle(self, *args, **options): + """run builder""" + populate_suggestions() diff --git a/bookwyrm/migrations/0046_user_default_post_privacy.py b/bookwyrm/migrations/0046_user_default_post_privacy.py new file mode 100644 index 000000000..f1c8e7c31 --- /dev/null +++ b/bookwyrm/migrations/0046_user_default_post_privacy.py @@ -0,0 +1,27 @@ +# Generated by Django 3.0.7 on 2021-02-14 00:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0045_auto_20210210_2114"), + ] + + operations = [ + migrations.AddField( + model_name="user", + name="default_post_privacy", + field=models.CharField( + choices=[ + ("public", "Public"), + ("unlisted", "Unlisted"), + ("followers", "Followers"), + ("direct", "Direct"), + ], + default="public", + max_length=255, + ), + ), + ] diff --git a/bookwyrm/migrations/0078_add_shelved_date.py b/bookwyrm/migrations/0078_add_shelved_date.py new file mode 100644 index 000000000..b8a95ab17 --- /dev/null +++ b/bookwyrm/migrations/0078_add_shelved_date.py @@ -0,0 +1,34 @@ +# Generated by Django 3.2.4 on 2021-07-03 08:25 + +from django.db import migrations, models +import django.utils.timezone + + +def copy_created_date(app_registry, schema_editor): + db_alias = schema_editor.connection.alias + ShelfBook = app_registry.get_model("bookwyrm", "ShelfBook") + ShelfBook.objects.all().update(shelved_date=models.F("created_date")) + + +def do_nothing(app_registry, schema_editor): + pass + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0077_auto_20210623_2155"), + ] + + operations = [ + migrations.AlterModelOptions( + name="shelfbook", + options={"ordering": ("-shelved_date",)}, + ), + migrations.AddField( + model_name="shelfbook", + name="shelved_date", + field=models.DateTimeField(default=django.utils.timezone.now), + ), + migrations.RunPython(copy_created_date, reverse_code=do_nothing), + ] diff --git a/bookwyrm/migrations/0079_merge_20210804_1746.py b/bookwyrm/migrations/0079_merge_20210804_1746.py new file mode 100644 index 000000000..ed5d50d0b --- /dev/null +++ b/bookwyrm/migrations/0079_merge_20210804_1746.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.4 on 2021-08-04 17:46 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0046_user_default_post_privacy"), + ("bookwyrm", "0078_add_shelved_date"), + ] + + operations = [] diff --git a/bookwyrm/migrations/0080_alter_shelfbook_options.py b/bookwyrm/migrations/0080_alter_shelfbook_options.py new file mode 100644 index 000000000..b5ee7e673 --- /dev/null +++ b/bookwyrm/migrations/0080_alter_shelfbook_options.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.4 on 2021-08-05 00:00 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0079_merge_20210804_1746"), + ] + + operations = [ + migrations.AlterModelOptions( + name="shelfbook", + options={"ordering": ("-shelved_date", "-created_date", "-updated_date")}, + ), + ] diff --git a/bookwyrm/migrations/0081_alter_user_last_active_date.py b/bookwyrm/migrations/0081_alter_user_last_active_date.py new file mode 100644 index 000000000..dc6b640f6 --- /dev/null +++ b/bookwyrm/migrations/0081_alter_user_last_active_date.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.4 on 2021-08-06 02:51 + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0080_alter_shelfbook_options"), + ] + + operations = [ + migrations.AlterField( + model_name="user", + name="last_active_date", + field=models.DateTimeField(default=django.utils.timezone.now), + ), + ] diff --git a/bookwyrm/migrations/0082_auto_20210806_2324.py b/bookwyrm/migrations/0082_auto_20210806_2324.py new file mode 100644 index 000000000..ab0aa158b --- /dev/null +++ b/bookwyrm/migrations/0082_auto_20210806_2324.py @@ -0,0 +1,56 @@ +# Generated by Django 3.2.4 on 2021-08-06 23:24 + +import bookwyrm.models.base_model +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0081_alter_user_last_active_date"), + ] + + operations = [ + migrations.AddField( + model_name="sitesettings", + name="require_confirm_email", + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name="user", + name="confirmation_code", + field=models.CharField( + default=bookwyrm.models.base_model.new_access_code, max_length=32 + ), + ), + migrations.AlterField( + model_name="connector", + name="deactivation_reason", + field=models.CharField( + blank=True, + choices=[ + ("pending", "Pending"), + ("self_deletion", "Self Deletion"), + ("moderator_deletion", "Moderator Deletion"), + ("domain_block", "Domain Block"), + ], + max_length=255, + null=True, + ), + ), + migrations.AlterField( + model_name="user", + name="deactivation_reason", + field=models.CharField( + blank=True, + choices=[ + ("pending", "Pending"), + ("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 2cb7c0365..5b55ea50f 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -1,4 +1,6 @@ """ base model with default fields """ +import base64 +from Crypto import Random from django.db import models from django.dispatch import receiver @@ -9,6 +11,7 @@ from .fields import RemoteIdField DeactivationReason = models.TextChoices( "DeactivationReason", [ + "pending", "self_deletion", "moderator_deletion", "domain_block", @@ -16,6 +19,11 @@ DeactivationReason = models.TextChoices( ) +def new_access_code(): + """the identifier for a user invite""" + return base64.b32encode(Random.get_random_bytes(5)).decode("ascii") + + class BookWyrmModel(models.Model): """shared fields""" diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py index c45181196..9ab300b3c 100644 --- a/bookwyrm/models/favorite.py +++ b/bookwyrm/models/favorite.py @@ -30,7 +30,7 @@ class Favorite(ActivityMixin, BookWyrmModel): def save(self, *args, **kwargs): """update user active time""" self.user.last_active_date = timezone.now() - self.user.save(broadcast=False) + self.user.save(broadcast=False, update_fields=["last_active_date"]) super().save(*args, **kwargs) if self.status.user.local and self.status.user != self.user: diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index b59b61072..b58f81747 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -13,6 +13,7 @@ from django.db import models 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 from bookwyrm.connectors import get_image from bookwyrm.sanitize_html import InputHtmlParser @@ -66,7 +67,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. Returns if changed""" try: value = getattr(data, self.get_activitypub_field()) except AttributeError: @@ -76,8 +77,14 @@ class ActivitypubFieldMixin: value = getattr(data, "actor") formatted = self.field_from_activity(value) if formatted is None or formatted is MISSING or formatted == {}: - return + return False + + # the field is unchanged + if hasattr(instance, self.name) and getattr(instance, self.name) == formatted: + return False + setattr(instance, self.name, formatted) + return True def set_activity_from_field(self, activity, instance): """update the json object""" @@ -204,6 +211,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField): # pylint: disable=invalid-name def set_field_from_activity(self, instance, data): + original = getattr(instance, self.name) to = data.to cc = data.cc if to == [self.public]: @@ -214,6 +222,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField): setattr(instance, self.name, "unlisted") else: setattr(instance, self.name, "followers") + return original == getattr(instance, self.name) def set_activity_from_field(self, activity, instance): # explicitly to anyone mentioned (statuses only) @@ -269,9 +278,10 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField): value = getattr(data, self.get_activitypub_field()) formatted = self.field_from_activity(value) if formatted is None or formatted is MISSING: - return + return False getattr(instance, self.name).set(formatted) instance.save(broadcast=False) + return True def field_to_activity(self, value): if self.link_only: @@ -354,7 +364,8 @@ def image_serializer(value, alt): url = value.url else: return None - url = "https://%s%s" % (DOMAIN, url) + if not url[:4] == "http": + url = "https://{:s}{:s}".format(DOMAIN, url) return activitypub.Document(url=url, name=alt) @@ -371,8 +382,10 @@ class ImageField(ActivitypubFieldMixin, models.ImageField): value = getattr(data, self.get_activitypub_field()) formatted = self.field_from_activity(value) if formatted is None or formatted is MISSING: - return + return False + getattr(instance, self.name).save(*formatted, save=save) + return True def set_activity_from_field(self, activity, instance): value = getattr(instance, self.name) diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py index 664daa13d..df341c8b2 100644 --- a/bookwyrm/models/readthrough.py +++ b/bookwyrm/models/readthrough.py @@ -30,7 +30,7 @@ class ReadThrough(BookWyrmModel): def save(self, *args, **kwargs): """update user active time""" self.user.last_active_date = timezone.now() - self.user.save(broadcast=False) + self.user.save(broadcast=False, update_fields=["last_active_date"]) super().save(*args, **kwargs) def create_update(self): @@ -55,5 +55,5 @@ class ProgressUpdate(BookWyrmModel): def save(self, *args, **kwargs): """update user active time""" self.user.last_active_date = timezone.now() - self.user.save(broadcast=False) + self.user.save(broadcast=False, update_fields=["last_active_date"]) super().save(*args, **kwargs) diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py index 4110ae8dc..c4e907d27 100644 --- a/bookwyrm/models/shelf.py +++ b/bookwyrm/models/shelf.py @@ -1,6 +1,7 @@ """ puttin' books on shelves """ import re from django.db import models +from django.utils import timezone from bookwyrm import activitypub from .activitypub_mixin import CollectionItemMixin, OrderedCollectionMixin @@ -69,6 +70,7 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel): "Edition", on_delete=models.PROTECT, activitypub_field="book" ) shelf = models.ForeignKey("Shelf", on_delete=models.PROTECT) + shelved_date = models.DateTimeField(default=timezone.now) user = fields.ForeignKey( "User", on_delete=models.PROTECT, activitypub_field="actor" ) @@ -86,4 +88,4 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel): you can't put a book on shelf twice""" unique_together = ("book", "shelf") - ordering = ("-created_date",) + ordering = ("-shelved_date", "-created_date", "-updated_date") diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index 872f6b454..ef3f7c3ca 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -1,8 +1,6 @@ """ the particulars for this instance of BookWyrm """ -import base64 import datetime -from Crypto import Random from django.db import models, IntegrityError from django.dispatch import receiver from django.utils import timezone @@ -10,7 +8,7 @@ from model_utils import FieldTracker from bookwyrm.preview_images import generate_site_preview_image_task from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES -from .base_model import BookWyrmModel +from .base_model import BookWyrmModel, new_access_code from .user import User @@ -33,6 +31,7 @@ class SiteSettings(models.Model): # registration allow_registration = models.BooleanField(default=True) allow_invite_requests = models.BooleanField(default=True) + require_confirm_email = models.BooleanField(default=True) # images logo = models.ImageField(upload_to="logos/", null=True, blank=True) @@ -61,11 +60,6 @@ class SiteSettings(models.Model): return default_settings -def new_access_code(): - """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""" diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 49458a2e0..e10bcd293 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import AbstractUser, Group from django.contrib.postgres.fields import CICharField from django.core.validators import MinValueValidator from django.dispatch import receiver -from django.db import models +from django.db import models, transaction from django.utils import timezone from model_utils import FieldTracker import pytz @@ -17,16 +17,22 @@ from bookwyrm.connectors import get_data, ConnectorException from bookwyrm.models.shelf import Shelf from bookwyrm.models.status import Status, Review from bookwyrm.preview_images import generate_user_preview_image_task -from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES +from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES, USE_HTTPS 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, DeactivationReason +from .base_model import BookWyrmModel, DeactivationReason, new_access_code from .federated_server import FederatedServer from . import fields, Review +def site_link(): + """helper for generating links to the site""" + protocol = "https" if USE_HTTPS else "http" + return f"{protocol}://{DOMAIN}" + + class User(OrderedCollectionPageMixin, AbstractUser): """a user who wants to read books""" @@ -105,10 +111,13 @@ class User(OrderedCollectionPageMixin, AbstractUser): through_fields=("user", "status"), related_name="favorite_statuses", ) + default_post_privacy = models.CharField( + max_length=255, default="public", choices=fields.PrivacyLevels.choices + ) 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) + last_active_date = models.DateTimeField(default=timezone.now) manually_approves_followers = fields.BooleanField(default=False) show_goal = models.BooleanField(default=True) discoverable = fields.BooleanField(default=False) @@ -120,11 +129,18 @@ class User(OrderedCollectionPageMixin, AbstractUser): deactivation_reason = models.CharField( max_length=255, choices=DeactivationReason.choices, null=True, blank=True ) + confirmation_code = models.CharField(max_length=32, default=new_access_code) name_field = "username" property_fields = [("following_link", "following")] field_tracker = FieldTracker(fields=["name", "avatar"]) + @property + def confirmation_link(self): + """helper for generating confirmation links""" + link = site_link() + return f"{link}/confirm-email/{self.confirmation_code}" + @property def following_link(self): """just how to find out the following info""" @@ -204,7 +220,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): self.following.order_by("-updated_date").all(), remote_id=remote_id, id_only=True, - **kwargs + **kwargs, ) def to_followers_activity(self, **kwargs): @@ -214,7 +230,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): self.followers.order_by("-updated_date").all(), remote_id=remote_id, id_only=True, - **kwargs + **kwargs, ) def to_activity(self, **kwargs): @@ -243,7 +259,6 @@ class User(OrderedCollectionPageMixin, AbstractUser): # 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) # this user already exists, no need to populate fields if not created: @@ -253,13 +268,13 @@ class User(OrderedCollectionPageMixin, AbstractUser): # 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) + transaction.on_commit(lambda: set_remote_server.delay(self.id)) return # populate fields for local users - self.remote_id = "https://%s/user/%s" % (DOMAIN, self.localname) + self.remote_id = "%s/user/%s" % (site_link(), self.localname) self.inbox = "%s/inbox" % self.remote_id - self.shared_inbox = "https://%s/inbox" % DOMAIN + self.shared_inbox = "%s/inbox" % site_link() self.outbox = "%s/outbox" % self.remote_id # an id needs to be set before we can proceed with related models @@ -276,7 +291,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): self.key_pair = KeyPair.objects.create( remote_id="%s/#main-key" % self.remote_id ) - self.save(broadcast=False) + self.save(broadcast=False, update_fields=["key_pair"]) shelves = [ { @@ -406,7 +421,7 @@ def set_remote_server(user_id): 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.save(broadcast=False) + user.save(broadcast=False, update_fields=["federated_server"]) if user.bookwyrm_user and user.outbox: get_remote_reviews.delay(user.outbox) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 510625e39..4f85bb56e 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -11,6 +11,7 @@ from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor from django.core.files.base import ContentFile from django.core.files.uploadedfile import InMemoryUploadedFile +from django.core.files.storage import default_storage from django.db.models import Avg from bookwyrm import models, settings @@ -319,9 +320,9 @@ def save_and_cleanup(image, instance=None): try: try: - old_path = instance.preview_image.path + old_path = instance.preview_image.name except ValueError: - old_path = "" + old_path = None # Save image.save(image_buffer, format="jpeg", quality=75) @@ -337,13 +338,13 @@ def save_and_cleanup(image, instance=None): save_without_broadcast = isinstance(instance, (models.Book, models.User)) if save_without_broadcast: - instance.save(broadcast=False) + instance.save(broadcast=False, update_fields=["preview_image"]) else: - instance.save() + instance.save(update_fields=["preview_image"]) # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) + if old_path and default_storage.exists(old_path): + default_storage.delete(old_path) finally: image_buffer.close() diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py index 322b0611c..f908e163c 100644 --- a/bookwyrm/redis_store.py +++ b/bookwyrm/redis_store.py @@ -54,15 +54,15 @@ class RedisStore(ABC): pipeline.execute() def bulk_remove_objects_from_store(self, objs, store): - """remoev a list of objects from a given store""" + """remove 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 + def get_store(self, store, **kwargs): # pylint: disable=no-self-use """load the values in a store""" - return r.zrevrange(store, 0, -1) + return r.zrevrange(store, 0, -1, **kwargs) def populate_store(self, store): """go from zero to a store""" diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 2d1ea84d7..4da064de0 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -54,6 +54,7 @@ SECRET_KEY = env("SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! DEBUG = env.bool("DEBUG", True) +USE_HTTPS = env.bool("USE_HTTPS", False) ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", ["*"]) @@ -70,6 +71,7 @@ INSTALLED_APPS = [ "django_rename_app", "bookwyrm", "celery", + "storages", ] MIDDLEWARE = [ @@ -113,7 +115,11 @@ REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD", None) REDIS_ACTIVITY_SOCKET = env("REDIS_ACTIVITY_SOCKET", None) MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200)) -STREAMS = ["home", "local", "federated"] + +STREAMS = [ + {"key": "home", "name": _("Home Timeline"), "shortname": _("Home")}, + {"key": "books", "name": _("Books Timeline"), "shortname": _("Books")}, +] # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases @@ -176,19 +182,51 @@ USE_L10N = True USE_TZ = True -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.2/howto/static-files/ - -PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) -STATIC_URL = "/static/" -STATIC_PATH = "%s/%s" % (DOMAIN, env("STATIC_ROOT", "static")) -STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) -MEDIA_URL = "/images/" -MEDIA_PATH = "%s/%s" % (DOMAIN, env("MEDIA_ROOT", "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, ) + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/3.2/howto/static-files/ + +PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) + +# Storage + +PROTOCOL = "http" +if USE_HTTPS: + PROTOCOL = "https" + +USE_S3 = env.bool("USE_S3", False) + +if USE_S3: + # AWS settings + AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID") + AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY") + AWS_STORAGE_BUCKET_NAME = env("AWS_STORAGE_BUCKET_NAME") + AWS_S3_CUSTOM_DOMAIN = env("AWS_S3_CUSTOM_DOMAIN") + AWS_S3_REGION_NAME = env("AWS_S3_REGION_NAME", "") + AWS_S3_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL") + AWS_DEFAULT_ACL = "public-read" + AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"} + # S3 Static settings + STATIC_LOCATION = "static" + STATIC_URL = "https://%s/%s/" % (AWS_S3_CUSTOM_DOMAIN, STATIC_LOCATION) + STATICFILES_STORAGE = "bookwyrm.storage_backends.StaticStorage" + # S3 Media settings + MEDIA_LOCATION = "images" + MEDIA_URL = "https://%s/%s/" % (AWS_S3_CUSTOM_DOMAIN, MEDIA_LOCATION) + MEDIA_FULL_URL = MEDIA_URL + DEFAULT_FILE_STORAGE = "bookwyrm.storage_backends.ImagesStorage" + # I don't know if it's used, but the site crashes without it + STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) + MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images")) +else: + STATIC_URL = "/static/" + STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) + MEDIA_URL = "/images/" + MEDIA_FULL_URL = "%s://%s%s" % (PROTOCOL, DOMAIN, MEDIA_URL) + MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images")) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 3db25d1fe..d10fb9b7e 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -72,6 +72,14 @@ body { flex-grow: 1; } +.preserve-whitespace p { + white-space: pre-wrap !important; +} + +.display-inline p { + display: inline !important; +} + /** Shelving ******************************************************************************/ diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py new file mode 100644 index 000000000..e10dfb841 --- /dev/null +++ b/bookwyrm/storage_backends.py @@ -0,0 +1,17 @@ +"""Handles backends for storages""" +from storages.backends.s3boto3 import S3Boto3Storage + + +class StaticStorage(S3Boto3Storage): # pylint: disable=abstract-method + """Storage class for Static contents""" + + location = "static" + default_acl = "public-read" + + +class ImagesStorage(S3Boto3Storage): # pylint: disable=abstract-method + """Storage class for Image files""" + + location = "images" + default_acl = "public-read" + file_overwrite = False diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py new file mode 100644 index 000000000..9c42d79d8 --- /dev/null +++ b/bookwyrm/suggested_users.py @@ -0,0 +1,221 @@ +""" store recommended follows in redis """ +import math +import logging +from django.dispatch import receiver +from django.db.models import signals, Count, Q + +from bookwyrm import models +from bookwyrm.redis_store import RedisStore, r +from bookwyrm.tasks import app + + +logger = logging.getLogger(__name__) + + +class SuggestedUsers(RedisStore): + """suggested users for a user""" + + max_length = 30 + + def get_rank(self, obj): + """get computed rank""" + return obj.mutuals # + (1.0 - (1.0 / (obj.shared_books + 1))) + + def store_id(self, user): # pylint: disable=no-self-use + """the key used to store this user's recs""" + if isinstance(user, int): + return "{:d}-suggestions".format(user) + return "{:d}-suggestions".format(user.id) + + def get_counts_from_rank(self, rank): # pylint: disable=no-self-use + """calculate mutuals count and shared books count from rank""" + return { + "mutuals": math.floor(rank), + # "shared_books": int(1 / (-1 * (rank % 1 - 1))) - 1, + } + + def get_objects_for_store(self, store): + """a list of potential follows for a user""" + user = models.User.objects.get(id=store.split("-")[0]) + + return get_annotated_users( + user, + ~Q(id=user.id), + ~Q(followers=user), + ~Q(follower_requests=user), + bookwyrm_user=True, + ) + + def get_stores_for_object(self, obj): + return [self.store_id(u) for u in self.get_users_for_object(obj)] + + def get_users_for_object(self, obj): # pylint: disable=no-self-use + """given a user, who might want to follow them""" + return models.User.objects.filter(local=True,).exclude( + Q(id=obj.id) | Q(followers=obj) | Q(id__in=obj.blocks.all()) | Q(blocks=obj) + ) + + def rerank_obj(self, obj, update_only=True): + """update all the instances of this user with new ranks""" + pipeline = r.pipeline() + for store_user in self.get_users_for_object(obj): + annotated_user = get_annotated_users( + store_user, + id=obj.id, + ).first() + if not annotated_user: + continue + + pipeline.zadd( + self.store_id(store_user), + self.get_value(annotated_user), + xx=update_only, + ) + pipeline.execute() + + def rerank_user_suggestions(self, user): + """update the ranks of the follows suggested to a user""" + self.populate_store(self.store_id(user)) + + def remove_suggestion(self, user, suggested_user): + """take a user out of someone's suggestions""" + self.bulk_remove_objects_from_store([suggested_user], self.store_id(user)) + + def get_suggestions(self, user): + """get suggestions""" + values = self.get_store(self.store_id(user), withscores=True) + results = [] + # annotate users with mutuals and shared book counts + for user_id, rank in values[:5]: + counts = self.get_counts_from_rank(rank) + try: + user = models.User.objects.get(id=user_id) + except models.User.DoesNotExist as err: + # if this happens, the suggestions are janked way up + logger.exception(err) + continue + user.mutuals = counts["mutuals"] + # user.shared_books = counts["shared_books"] + results.append(user) + return results + + +def get_annotated_users(viewer, *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=viewer.blocks.all()) | Q(blocks=viewer)) + .annotate( + mutuals=Count( + "followers", + filter=Q( + ~Q(id=viewer.id), + ~Q(id__in=viewer.following.all()), + followers__in=viewer.following.all(), + ), + distinct=True, + ), + # shared_books=Count( + # "shelfbook", + # filter=Q( + # ~Q(id=viewer.id), + # shelfbook__book__parent_work__in=[ + # s.book.parent_work for s in viewer.shelfbook_set.all() + # ], + # ), + # distinct=True, + # ), + ) + ) + + +suggested_users = SuggestedUsers() + + +@receiver(signals.post_save, sender=models.UserFollows) +# pylint: disable=unused-argument +def update_suggestions_on_follow(sender, instance, created, *args, **kwargs): + """remove a follow from the recs and update the ranks""" + if not created or not instance.user_object.discoverable: + return + + if instance.user_subject.local: + remove_suggestion_task.delay(instance.user_subject.id, instance.user_object.id) + rerank_user_task.delay(instance.user_object.id, update_only=False) + + +@receiver(signals.post_save, sender=models.UserBlocks) +# pylint: disable=unused-argument +def update_suggestions_on_block(sender, instance, *args, **kwargs): + """remove blocked users from recs""" + if instance.user_subject.local and instance.user_object.discoverable: + remove_suggestion_task.delay(instance.user_subject.id, instance.user_object.id) + if instance.user_object.local and instance.user_subject.discoverable: + remove_suggestion_task.delay(instance.user_object.id, instance.user_subject.id) + + +@receiver(signals.post_delete, sender=models.UserFollows) +# pylint: disable=unused-argument +def update_suggestions_on_unfollow(sender, instance, **kwargs): + """update rankings, but don't re-suggest because it was probably intentional""" + if instance.user_object.discoverable: + rerank_user_task.delay(instance.user_object.id, update_only=False) + + +# @receiver(signals.post_save, sender=models.ShelfBook) +# @receiver(signals.post_delete, sender=models.ShelfBook) +# # pylint: disable=unused-argument +# def update_rank_on_shelving(sender, instance, *args, **kwargs): +# """when a user shelves or unshelves a book, re-compute their rank""" +# # if it's a local user, re-calculate who is rec'ed to them +# if instance.user.local: +# rerank_suggestions_task.delay(instance.user.id) +# +# # if the user is discoverable, update their rankings +# if instance.user.discoverable: +# rerank_user_task.delay(instance.user.id) + + +@receiver(signals.post_save, sender=models.User) +# pylint: disable=unused-argument, too-many-arguments +def add_new_user(sender, instance, created, update_fields=None, **kwargs): + """a new user, wow how cool""" + # a new user is found, create suggestions for them + if created and instance.local: + rerank_suggestions_task.delay(instance.id) + + if update_fields and not "discoverable" in update_fields: + return + + # this happens on every save, not just when discoverability changes, annoyingly + if instance.discoverable: + rerank_user_task.delay(instance.id, update_only=False) + elif not created: + remove_user_task.delay(instance.id) + + +@app.task +def rerank_suggestions_task(user_id): + """do the hard work in celery""" + suggested_users.rerank_user_suggestions(user_id) + + +@app.task +def rerank_user_task(user_id, update_only=False): + """do the hard work in celery""" + user = models.User.objects.get(id=user_id) + suggested_users.rerank_obj(user, update_only=update_only) + + +@app.task +def remove_user_task(user_id): + """do the hard work in celery""" + user = models.User.objects.get(id=user_id) + suggested_users.remove_object_from_related_stores(user) + + +@app.task +def remove_suggestion_task(user_id, suggested_user_id): + """remove a specific user from a specific user's suggestions""" + suggested_user = models.User.objects.get(id=suggested_user_id) + suggested_users.remove_suggestion(user_id, suggested_user) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 9a75cbe94..c5dab1097 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -1,5 +1,10 @@ {% extends 'layout.html' %} -{% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}{% load layout %} +{% load i18n %} +{% load bookwyrm_tags %} +{% load humanize %} +{% load utilities %} +{% load static %} +{% load layout %} {% block title %}{{ book|book_title }}{% endblock %} @@ -321,5 +326,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/bookwyrm/templates/confirm_email/confirm_email.html b/bookwyrm/templates/confirm_email/confirm_email.html new file mode 100644 index 000000000..6c9eda5ee --- /dev/null +++ b/bookwyrm/templates/confirm_email/confirm_email.html @@ -0,0 +1,44 @@ +{% extends "layout.html" %} +{% load i18n %} + +{% block title %}{% trans "Confirm email" %}{% endblock %} + +{% block content %} +

{% trans "Confirm your email address" %}

+ +
+
+
+
+

{% trans "A confirmation code has been sent to the email address you used to register your account." %}

+ {% if not valid %} +

{% trans "Sorry! We couldn't find that code." %}

+ {% endif %} +
+ {% csrf_token %} + +
+
+ +
+
+ +
+
+
+
+ +
+ {% trans "Can't find your code?" as button_text %} + {% include "snippets/toggle/open_button.html" with text=button_text controls_text="resend-form" focus="resend-form-header" %} + {% include "confirm_email/resend_form.html" with controls_text="resend-form" %} +
+
+
+
+
+ {% include 'snippets/about.html' %} +
+
+
+{% endblock %} diff --git a/bookwyrm/templates/confirm_email/resend_form.html b/bookwyrm/templates/confirm_email/resend_form.html new file mode 100644 index 000000000..7c0c10980 --- /dev/null +++ b/bookwyrm/templates/confirm_email/resend_form.html @@ -0,0 +1,20 @@ +{% extends "components/inline_form.html" %} +{% load i18n %} +{% block header %} +{% trans "Resend confirmation link" %} +{% endblock %} + +{% block form %} +
+ {% csrf_token %} +
+ +
+ +
+
+
+ +
+
+{% endblock %} diff --git a/bookwyrm/templates/directory/user_card.html b/bookwyrm/templates/directory/user_card.html index c52c1f7ae..ccae925a1 100644 --- a/bookwyrm/templates/directory/user_card.html +++ b/bookwyrm/templates/directory/user_card.html @@ -11,14 +11,21 @@
- {{ user.display_name }} + + {{ user.display_name }} + {% if user.manually_approves_followers %} + + {% trans "Locked account" %} + + {% endif %} + @{{ user|username }} {% include 'snippets/follow_button.html' with user=user %}
-
+
{% if user.summary %} {{ user.summary|to_markdown|safe|truncatechars_html:40 }} {% else %} {% endif %} diff --git a/bookwyrm/templates/email/confirm/html_content.html b/bookwyrm/templates/email/confirm/html_content.html new file mode 100644 index 000000000..231b0388e --- /dev/null +++ b/bookwyrm/templates/email/confirm/html_content.html @@ -0,0 +1,20 @@ +{% extends 'email/html_layout.html' %} +{% load i18n %} + +{% block content %} +

+{% blocktrans trimmed %} +One last step before you join {{ site_name }}! Please confirm your email address by clicking the link below: +{% endblocktrans %} +

+ +{% trans "Confirm Email" as text %} +{% include 'email/snippets/action.html' with path=confirmation_link text=text %} + +

+{% blocktrans trimmed %} +Or enter the code "{{ confirmation_code }}" at login. +{% endblocktrans %} +

+ +{% endblock %} diff --git a/bookwyrm/templates/email/confirm/subject.html b/bookwyrm/templates/email/confirm/subject.html new file mode 100644 index 000000000..b81a5a83f --- /dev/null +++ b/bookwyrm/templates/email/confirm/subject.html @@ -0,0 +1,4 @@ +{% load i18n %} +{% blocktrans trimmed %} +Please confirm your email +{% endblocktrans %} diff --git a/bookwyrm/templates/email/confirm/text_content.html b/bookwyrm/templates/email/confirm/text_content.html new file mode 100644 index 000000000..847009e55 --- /dev/null +++ b/bookwyrm/templates/email/confirm/text_content.html @@ -0,0 +1,14 @@ +{% extends 'email/text_layout.html' %} +{% load i18n %} +{% block content %} +{% blocktrans trimmed %} +One last step before you join {{ site_name }}! Please confirm your email address by clicking the link below: +{% endblocktrans %} + +{{ confirmation_link }} + +{% blocktrans trimmed %} +Or enter the code "{{ confirmation_code }}" at login. +{% endblocktrans %} + +{% endblock %} diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html index 0b7dcd79c..30a50cd0a 100644 --- a/bookwyrm/templates/feed/direct_messages.html +++ b/bookwyrm/templates/feed/direct_messages.html @@ -1,4 +1,4 @@ -{% extends 'feed/feed_layout.html' %} +{% extends 'feed/layout.html' %} {% load i18n %} {% block panel %} diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html index 21e71ae18..780f1d171 100644 --- a/bookwyrm/templates/feed/feed.html +++ b/bookwyrm/templates/feed/feed.html @@ -1,38 +1,28 @@ -{% extends 'feed/feed_layout.html' %} +{% extends 'feed/layout.html' %} {% load i18n %} {% block panel %}

- {% if tab == 'home' %} - {% trans "Home Timeline" %} - {% elif tab == 'local' %} - {% trans "Local Timeline" %} - {% else %} - {% trans "Federated Timeline" %} - {% endif %} + {{ tab.name }}

{# announcements and system messages #} {% if not activities.number > 1 %} -{% if request.user.show_goal and not goal and tab == 'home' %} +{% if request.user.show_goal and not goal and tab.key == streams.first.key %} {% now 'Y' as year %}
{% include 'snippets/goal_card.html' with year=year %} @@ -44,18 +34,22 @@ {# activity feed #} {% if not activities %} -

{% trans "There aren't any activities right now! Try following a user to get started" %}

+
+

{% trans "There aren't any activities right now! Try following a user to get started" %}

+ + {% if suggested_users %} + {# suggested users for when things are very lonely #} + {% include 'feed/suggested_users.html' with suggested_users=suggested_users %} +
+{% endif %} + {% 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 #} -
-

{% trans "Who to follow" %}

- {% include 'feed/suggested_users.html' with suggested_users=suggested_users %} - View directory -
+{% include 'feed/suggested_users.html' with suggested_users=suggested_users %} {% endif %}
{% include 'snippets/status/status.html' with status=activity %} diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html deleted file mode 100644 index 3c6b65a1b..000000000 --- a/bookwyrm/templates/feed/feed_layout.html +++ /dev/null @@ -1,107 +0,0 @@ -{% extends 'layout.html' %} -{% load i18n %} - -{% block title %}{% trans "Updates" %}{% endblock %} - -{% block content %} -
- {% if user.is_authenticated %} -
-

{% trans "Your books" %}

- {% if not suggested_books %} -

{% trans "There are no books here right now! Try searching for a book to get started" %}

- {% else %} - {% with active_book=request.GET.book %} -
-
-
    - {% for shelf in suggested_books %} - {% if shelf.books %} - {% with shelf_counter=forloop.counter %} -
  • -

    - {% 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 %} -

    -
    - -
    -
    • - {% endwith %} - {% endif %} - {% endfor %} -
-
- {% for shelf in suggested_books %} - {% with shelf_counter=forloop.counter %} - {% for book in shelf.books %} -
- -
-
-
-

{% include 'snippets/book_titleby.html' with book=book %}

- {% include 'snippets/shelve_button/shelve_button.html' with book=book %} -
-
-
- {% 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 %} -
-
-
- {% include 'snippets/create_status.html' with book=book %} -
-
- {% endfor %} - {% endwith %} - {% endfor %} -
- {% endwith %} - {% endif %} - - {% if goal %} -
-
-

{% blocktrans with yar=goal.year %}{{ year }} Reading Goal{% endblocktrans %}

- {% include 'snippets/goal_progress.html' with goal=goal %} -
-
- {% endif %} -
- {% endif %} - -
- {% block panel %}{% endblock %} - - {% if activities %} - {% include 'snippets/pagination.html' with page=activities path=path anchor="#feed" %} - {% endif %} -
-
-{% endblock %} - -{% block scripts %} - -{% endblock %} diff --git a/bookwyrm/templates/feed/layout.html b/bookwyrm/templates/feed/layout.html new file mode 100644 index 000000000..ad7d39f0c --- /dev/null +++ b/bookwyrm/templates/feed/layout.html @@ -0,0 +1,110 @@ +{% extends 'layout.html' %} +{% load i18n %} +{% load static %} + +{% block title %}{% trans "Updates" %}{% endblock %} + +{% block content %} +
+ {% if user.is_authenticated %} +
+
+

{% trans "Your books" %}

+ {% if not suggested_books %} +

{% trans "There are no books here right now! Try searching for a book to get started" %}

+ {% else %} + {% with active_book=request.GET.book %} +
+
+
    + {% for shelf in suggested_books %} + {% if shelf.books %} + {% with shelf_counter=forloop.counter %} +
  • +

    + {% 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 %} +

    +
    + +
    +
    • + {% endwith %} + {% endif %} + {% endfor %} +
+
+ {% for shelf in suggested_books %} + {% with shelf_counter=forloop.counter %} + {% for book in shelf.books %} +
+ +
+
+
+

{% include 'snippets/book_titleby.html' with book=book %}

+ {% include 'snippets/shelve_button/shelve_button.html' with book=book %} +
+
+
+ {% 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 %} +
+
+
+ {% include 'snippets/create_status.html' with book=book %} +
+
+ {% endfor %} + {% endwith %} + {% endfor %} +
+ {% endwith %} + {% endif %} +
+ + {% if goal %} +
+
+

{% blocktrans with yar=goal.year %}{{ year }} Reading Goal{% endblocktrans %}

+ {% include 'snippets/goal_progress.html' with goal=goal %} +
+
+ {% endif %} +
+ {% endif %} + +
+ {% block panel %}{% endblock %} + + {% if activities %} + {% include 'snippets/pagination.html' with page=activities path=path anchor="#feed" %} + {% endif %} +
+
+{% endblock %} + +{% block scripts %} + +{% endblock %} diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html index 9f90f355d..903ca7907 100644 --- a/bookwyrm/templates/feed/status.html +++ b/bookwyrm/templates/feed/status.html @@ -1,4 +1,4 @@ -{% extends 'feed/feed_layout.html' %} +{% extends 'feed/layout.html' %} {% load i18n %} {% block panel %} diff --git a/bookwyrm/templates/feed/suggested_users.html b/bookwyrm/templates/feed/suggested_users.html index eb146f7eb..c095faa55 100644 --- a/bookwyrm/templates/feed/suggested_users.html +++ b/bookwyrm/templates/feed/suggested_users.html @@ -1,25 +1,6 @@ {% load i18n %} -{% load utilities %} -{% load humanize %} -
- {% for user in suggested_users %} -
-
- - {% include 'snippets/avatar.html' with user=user large=True %} - {{ user.display_name|truncatechars:10 }} - @{{ user|username|truncatechars:8 }} - - {% include 'snippets/follow_button.html' with user=user minimal=True %} - {% if user.mutuals %} -

- {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %} -

- {% elif user.shared_books %} -

{% 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 %}

- {% endif %} -
-
- {% endfor %} -
- +
+

{% trans "Who to follow" %}

+ {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %} + View directory +
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html index 63c042895..08a2e7c54 100644 --- a/bookwyrm/templates/get_started/layout.html +++ b/bookwyrm/templates/get_started/layout.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% load i18n %} +{% load static %} {% block title %}{% trans "Welcome" %}{% endblock %} @@ -9,7 +10,7 @@
- +

{% blocktrans %}Welcome to {{ site_name }}!{% endblocktrans %} diff --git a/bookwyrm/templates/get_started/users.html b/bookwyrm/templates/get_started/users.html index 259f06d34..7ec7ed9d3 100644 --- a/bookwyrm/templates/get_started/users.html +++ b/bookwyrm/templates/get_started/users.html @@ -9,7 +9,7 @@
- {% if request.GET.query and not user_results %} + {% if request.GET.query and no_results %}

{% blocktrans with query=request.GET.query %}No users found for "{{ query }}"{% endblocktrans %}

{% endif %}
@@ -22,7 +22,7 @@

- {% include 'feed/suggested_users.html' with suggested_users=suggested_users %} + {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
{% endblock %} diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html index 134f419fc..b285eec43 100644 --- a/bookwyrm/templates/goal.html +++ b/bookwyrm/templates/goal.html @@ -17,9 +17,9 @@ {% block panel %}
- {% if user == request.user %} + {% now 'Y' as current_year %} + {% if user == request.user and year == current_year %}
- {% now 'Y' as year %}

diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html index 11ff47f19..e0ed8ab2e 100644 --- a/bookwyrm/templates/import_status.html +++ b/bookwyrm/templates/import_status.html @@ -1,6 +1,7 @@ {% extends 'layout.html' %} {% load i18n %} {% load humanize %} +{% load static %} {% block title %}{% trans "Import Status" %}{% endblock %} @@ -156,5 +157,5 @@ {% endspaceless %}{% endblock %} {% block scripts %} - + {% endblock %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 5e66ff799..c215648fc 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -1,14 +1,16 @@ -{% load layout %}{% load i18n %} +{% load layout %} +{% load i18n %} +{% load static %} {% block title %}BookWyrm{% endblock %} | {{ site.name }} - - - + + + - + {% if preview_images_enabled is True %} @@ -30,7 +32,7 @@
- +
@@ -149,7 +151,7 @@ {% if request.path != '/login' and request.path != '/login/' %}
- + {% csrf_token %}
@@ -242,8 +244,8 @@ - - + + {% block scripts %}{% endblock %} diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html index e3d0133cf..19c103eac 100644 --- a/bookwyrm/templates/login.html +++ b/bookwyrm/templates/login.html @@ -11,8 +11,13 @@ {% if login_form.non_field_errors %}

{{ login_form.non_field_errors }}

{% endif %} + + {% if show_confirmed_email %} +

{% trans "Success! Email address confirmed." %}

+ {% endif %} {% csrf_token %} + {% if show_confirmed_email %}{% endif %}
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html index 9e2af7bee..6732b8ef6 100644 --- a/bookwyrm/templates/preferences/edit_user.html +++ b/bookwyrm/templates/preferences/edit_user.html @@ -53,6 +53,14 @@ {{ form.manually_approves_followers }}
+
+ +
+ {{ form.default_post_privacy }} +
+
+
+ +

{% trans "(Recommended if registration is open)" %}

+
{{ site_form.registration_closed_text }} diff --git a/bookwyrm/templates/snippets/about.html b/bookwyrm/templates/snippets/about.html index 136a1a548..b94777d1c 100644 --- a/bookwyrm/templates/snippets/about.html +++ b/bookwyrm/templates/snippets/about.html @@ -1,7 +1,9 @@ +{% load static %} +
- BookWyrm logo + BookWyrm logo
diff --git a/bookwyrm/templates/snippets/authors.html b/bookwyrm/templates/snippets/authors.html index 476956b6e..5584417d9 100644 --- a/bookwyrm/templates/snippets/authors.html +++ b/bookwyrm/templates/snippets/authors.html @@ -1,9 +1,16 @@ {% spaceless %} +{% load i18n %} +{% load humanize %} {% 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 %} +{% firstof limit None as limit %} +{% with subtraction_value='-'|add:limit %} +{% with remainder_count=book.authors.count|add:subtraction_value %} +{% with remainder_count_display=remainder_count|intcomma %} + +{% for author in book.authors.all|slice:limit %} {{ author.name }}{% if not forloop.last %}, {% endif %} + >{{ author.name }}{% if not forloop.last %}, {% elif remainder_count > 0 %}, {% blocktrans trimmed count counter=remainder_count %} +and {{ remainder_count_display }} other +{% plural %} +and {{ remainder_count_display }} others +{% endblocktrans %}{% endif %} {% endfor %} + +{% endwith %} +{% endwith %} +{% endwith %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html index bb37c46d4..5f28cd4be 100644 --- a/bookwyrm/templates/snippets/avatar.html +++ b/bookwyrm/templates/snippets/avatar.html @@ -1,2 +1,4 @@ -{{ user.alt_text }} +{% load static %} + +{{ user.alt_text }} diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html index 16ab305e5..aa315e360 100644 --- a/bookwyrm/templates/snippets/book_cover.html +++ b/bookwyrm/templates/snippets/book_cover.html @@ -1,6 +1,7 @@ {% spaceless %} {% load i18n %} +{% load static %}
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html index 353f9d12e..5eddabff7 100644 --- a/bookwyrm/templates/snippets/book_titleby.html +++ b/bookwyrm/templates/snippets/book_titleby.html @@ -1,8 +1,15 @@ {% load i18n %} {% load utilities %} +{% spaceless %} + {% if book.authors %} -{% blocktrans with path=book.local_path title=book|book_title %}{{ title }} by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %} +{% blocktrans trimmed with path=book.local_path title=book|book_title %} +{{ title }} by +{% endblocktrans %} +{% include 'snippets/authors.html' with book=book limit=3 %} + {% else %} {{ book|book_title }} {% endif %} +{% endspaceless %} diff --git a/bookwyrm/templates/snippets/opengraph_images.html b/bookwyrm/templates/snippets/opengraph_images.html index bb3fde3ad..9668c3d65 100644 --- a/bookwyrm/templates/snippets/opengraph_images.html +++ b/bookwyrm/templates/snippets/opengraph_images.html @@ -1,12 +1,14 @@ +{% load static %} + {% if preview_images_enabled is True %} {% if image %} - - + + {% else %} - - + + {% endif %} {% else %} - - + + {% endif %} diff --git a/bookwyrm/templates/snippets/privacy_select.html b/bookwyrm/templates/snippets/privacy_select.html index f6959de53..d1215cc0b 100644 --- a/bookwyrm/templates/snippets/privacy_select.html +++ b/bookwyrm/templates/snippets/privacy_select.html @@ -5,17 +5,18 @@ {% if not no_label %} {% endif %} + {% firstof current user.default_post_privacy "public" as privacy %} diff --git a/bookwyrm/templates/snippets/register_form.html b/bookwyrm/templates/snippets/register_form.html index cd7ea8063..9e610bd13 100644 --- a/bookwyrm/templates/snippets/register_form.html +++ b/bookwyrm/templates/snippets/register_form.html @@ -12,7 +12,7 @@
- + {% for error in register_form.email.errors %}

{{ error | escape }}

{% endfor %} diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html index 39ef9173c..c33b34526 100644 --- a/bookwyrm/templates/snippets/status/content_status.html +++ b/bookwyrm/templates/snippets/status/content_status.html @@ -1,6 +1,7 @@ {% load bookwyrm_tags %} {% load markdown %} {% load i18n %} +{% load static %} {% with status_type=status.status_type %}
{{ attachment.caption }}
+ diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 69455806e..41d52812f 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -28,8 +28,10 @@
{% if user.summary %} -
+ {% spaceless %} +
{{ user.summary|to_markdown|safe }} + {% endspaceless %}
{% endif %}
diff --git a/bookwyrm/templates/user/relationships/following.html b/bookwyrm/templates/user/relationships/following.html index 5689bc613..475d40ab0 100644 --- a/bookwyrm/templates/user/relationships/following.html +++ b/bookwyrm/templates/user/relationships/following.html @@ -12,3 +12,4 @@ {% blocktrans with username=user.display_name %}{{ username }} isn't following any users{% endblocktrans %}
{% endblock %} + diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html index 2163db8cb..01a7eee9e 100644 --- a/bookwyrm/templates/user/shelf/shelf.html +++ b/bookwyrm/templates/user/shelf/shelf.html @@ -103,7 +103,7 @@ {% include 'snippets/authors.html' %} - {{ book.created_date|naturalday }} + {{ book.shelved_date|naturalday }} {% latest_read_through book user as read_through %} diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html index 22d44c878..c6b3ea842 100644 --- a/bookwyrm/templates/user/user_preview.html +++ b/bookwyrm/templates/user/user_preview.html @@ -10,7 +10,14 @@
-

{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}

+

+ {% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %} + {% if user.manually_approves_followers %} + + {% trans "Locked account" %} + + {% endif %} +

{{ user.username }}

{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}

@@ -23,7 +30,13 @@ {% mutuals_count user as mutuals %} + {% if mutuals %} {% blocktrans with mutuals_display=mutuals|intcomma count counter=mutuals %}{{ mutuals_display }} follower you follow{% plural %}{{ mutuals_display }} followers you follow{% endblocktrans %} + {% elif request.user in user.following.all %} + {% trans "Follows you" %} + {% else %} + {% trans "No followers you follow" %} + {% endif %} {% endif %} diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 5cba5455f..4811f4fd5 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -12,7 +12,7 @@ register = template.Library() def get_rating(book, user): """get the overall rating of a book""" queryset = views.helpers.privacy_filter( - user, models.Review.objects.filter(book=book) + user, models.Review.objects.filter(book__in=book.parent_work.editions.all()) ) return queryset.aggregate(Avg("rating"))["rating__avg"] diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py index fbb38da26..0a344340a 100644 --- a/bookwyrm/tests/activitypub/test_author.py +++ b/bookwyrm/tests/activitypub/test_author.py @@ -1,17 +1,14 @@ -import datetime - -from unittest.mock import patch +"""test author serializer""" from django.test import TestCase from bookwyrm import models class Author(TestCase): def setUp(self): - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.author = models.Author.objects.create( name="Author fullname", aliases=["One", "Two"], diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 9a88b1c66..0758fe99a 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -20,49 +20,52 @@ from bookwyrm import models @patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.suggested_users.rerank_user_task.delay") +@patch("bookwyrm.suggested_users.remove_user_task.delay") +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class BaseActivity(TestCase): """the super class for model-linked activitypub dataclasses""" def setUp(self): """we're probably going to re-use this so why copy/paste""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): 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" - self.user.save(broadcast=False) + self.user.remote_id = "http://example.com/a/b" + self.user.save(broadcast=False, update_fields=["remote_id"]) - 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"] + 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"] - 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) - self.image_data = output.getvalue() + 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) + 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) @@ -75,7 +78,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() @@ -84,7 +87,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) @@ -98,23 +101,22 @@ class BaseActivity(TestCase): status=200, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - result = resolve_remote_id( - "https://example.com/user/mouse", model=models.User - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + result = resolve_remote_id( + "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!!") - 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, @@ -141,24 +143,22 @@ class BaseActivity(TestCase): self.user.avatar.file # pylint: disable=pointless-statement # this would trigger a broadcast because it's a local user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - activity.to_model(model=models.User, instance=self.user) + 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") - 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( content="test status", user=self.user, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + book = models.Edition.objects.create( + title="Test Edition", remote_id="http://book.com/book" + ) update_data = activitypub.Note( id=status.remote_id, content=status.content, @@ -180,7 +180,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"): @@ -219,7 +219,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( diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py index 20dbcdfb5..67aaf891e 100644 --- a/bookwyrm/tests/activitypub/test_person.py +++ b/bookwyrm/tests/activitypub/test_person.py @@ -20,9 +20,8 @@ class Person(TestCase): def test_user_to_model(self): activity = activitypub.Person(**self.user_data) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - user = activity.to_model(model=models.User) + 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.assertFalse(user.local) diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index 59d4b1b61..c90348bc3 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -12,22 +12,20 @@ class Quotation(TestCase): def setUp(self): """model objects we'll need""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.user = models.User.objects.create_user( - "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", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.user = models.User.objects.create_user( + "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", ) + 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") self.status_data = json.loads(datafile.read_bytes()) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 4390a220a..8ce4c96bf 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -74,12 +74,11 @@ class AbstractConnector(TestCase): Mapping("openlibraryKey"), ] - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1234", - openlibrary_key="OL1234M", - ) + self.book = models.Edition.objects.create( + 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""" @@ -111,11 +110,8 @@ class AbstractConnector(TestCase): responses.add( responses.GET, "https://example.com/book/abcd", json=self.edition_data ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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) @@ -123,10 +119,12 @@ class AbstractConnector(TestCase): @responses.activate def test_get_or_create_author(self): """load an author""" - self.connector.author_mappings = [ - Mapping("id"), - Mapping("name"), - ] + self.connector.author_mappings = ( + [ # pylint: disable=attribute-defined-outside-init + Mapping("id"), + Mapping("name"), + ] + ) responses.add( responses.GET, diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py index 3a2480de4..46ea54a91 100644 --- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py +++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py @@ -1,5 +1,4 @@ """ testing book data connectors """ -from unittest.mock import patch import json import pathlib from django.test import TestCase @@ -26,9 +25,8 @@ class BookWyrmConnector(TestCase): def test_get_or_create_book_existing(self): """load book activity""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - book = models.Edition.objects.create(title="Test Edition", parent_work=work) + 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) diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py index 95920f072..67b108dd1 100644 --- a/bookwyrm/tests/connectors/test_connector_manager.py +++ b/bookwyrm/tests/connectors/test_connector_manager.py @@ -1,5 +1,4 @@ """ interface between the app and various connectors """ -from unittest.mock import patch from django.test import TestCase import responses @@ -14,15 +13,14 @@ class ConnectorManager(TestCase): def setUp(self): """we'll need some books and a connector info entry""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, isbn_10="0000000000" - ) - self.edition = models.Edition.objects.create( - title="Another Edition", parent_work=self.work, isbn_10="1111111111" - ) + 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", diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index c66f0400d..381017727 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -171,3 +171,15 @@ class Inventaire(TestCase): } self.assertEqual(get_language_code(options), "there") self.assertIsNone(get_language_code({})) + + @responses.activate + def test_get_description(self): + """extract a wikipedia excerpt""" + responses.add( + responses.GET, + "https://inventaire.io/api/data?action=wp-extract&lang=en&title=test_path", + json={"extract": "hi hi"}, + ) + + extract = self.connector.get_description({"enwiki": "test_path"}) + self.assertEqual(extract, "hi hi") diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 1cca34d68..699b26ed4 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -178,26 +178,20 @@ class Openlibrary(TestCase): @responses.activate def test_expand_book_data(self): """given a book, get more editions""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create( - title="Test Work", openlibrary_key="OL1234W" - ) - edition = models.Edition.objects.create( - title="Test Edition", parent_work=work - ) + 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": []}, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.connectors.abstract_connector.AbstractConnector." - "create_edition_from_data" - ): - self.connector.expand_book_data(edition) - self.connector.expand_book_data(work) + with patch( + "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""" @@ -230,14 +224,11 @@ class Openlibrary(TestCase): json={"hi": "there"}, status=200, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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 - ) + 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/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index 02c0c9a4f..86aa7add4 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -1,5 +1,4 @@ """ testing book data connectors """ -from unittest.mock import patch import datetime from django.test import TestCase from django.utils import timezone @@ -30,21 +29,19 @@ class SelfConnector(TestCase): def test_format_search_result(self): """create a SearchResult""" author = models.Author.objects.create(name="Anonymous") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - edition = models.Edition.objects.create( - 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] + edition = models.Edition.objects.create( + 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") self.assertEqual(result.key, edition.remote_id) self.assertEqual(result.author, "Anonymous") self.assertEqual(result.year, 1980) self.assertEqual(result.connector, self.connector) - @patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay") - def test_search_rank(self, _): + def test_search_rank(self): """prioritize certain results""" author = models.Author.objects.create(name="Anonymous") edition = models.Edition.objects.create( @@ -81,8 +78,7 @@ class SelfConnector(TestCase): self.assertEqual(results[2].title, "Edition of Example Work") self.assertEqual(results[3].title, "Another Edition") - @patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay") - def test_search_multiple_editions(self, _): + 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") edition_1 = models.Edition.objects.create( diff --git a/bookwyrm/tests/data/ap_user.json b/bookwyrm/tests/data/ap_user.json index bc4488e38..63c8a7e83 100644 --- a/bookwyrm/tests/data/ap_user.json +++ b/bookwyrm/tests/data/ap_user.json @@ -28,7 +28,7 @@ }, "bookwyrmUser": true, "manuallyApprovesFollowers": false, - "discoverable": true, + "discoverable": false, "devices": "https://friend.camp/users/tripofmice/collections/devices", "tag": [], "icon": { diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index 81f47e6f5..e92bdb354 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -3,6 +3,8 @@ from collections import namedtuple import csv import pathlib from unittest.mock import patch +import datetime +import pytz from django.test import TestCase import responses @@ -13,6 +15,13 @@ from bookwyrm.importers.importer import import_data, handle_imported_book from bookwyrm.settings import DOMAIN +def make_date(*args): + """helper function to easily generate a date obj""" + return datetime.datetime(*args, tzinfo=pytz.UTC) + + +# pylint: disable=consider-using-with +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class GoodreadsImport(TestCase): """importing from goodreads csv""" @@ -21,7 +30,7 @@ class GoodreadsImport(TestCase): self.importer = GoodreadsImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") self.csv = open(datafile, "r", encoding=self.importer.encoding) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) @@ -37,15 +46,14 @@ class GoodreadsImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_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, - ) + 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): + 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) @@ -61,7 +69,7 @@ class GoodreadsImport(TestCase): self.assertEqual(import_items[2].index, 2) self.assertEqual(import_items[2].data["Book Id"], "28694510") - def test_create_retry_job(self): + 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] @@ -79,7 +87,7 @@ class GoodreadsImport(TestCase): self.assertEqual(retry_items[1].index, 1) self.assertEqual(retry_items[1].data["Book Id"], "52691223") - def test_start_import(self): + def test_start_import(self, _): """begin loading books""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") MockTask = namedtuple("Task", ("id")) @@ -91,11 +99,10 @@ class GoodreadsImport(TestCase): self.assertEqual(import_job.task_id, "7") @responses.activate - def test_import_data(self): + def test_import_data(self, _): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create(title="Test Book") + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -107,46 +114,11 @@ class GoodreadsImport(TestCase): 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): + def test_handle_imported_book(self, _): """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") - 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.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - 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, 2020) - self.assertEqual(readthrough.start_date.month, 10) - self.assertEqual(readthrough.start_date.day, 21) - self.assertEqual(readthrough.finish_date.year, 2020) - 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) - import_job = models.ImportJob.objects.create(user=self.user) datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") csv_file = open(datafile, "r") @@ -164,17 +136,54 @@ class GoodreadsImport(TestCase): shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) - self.assertIsNone(self.user.shelf_set.get(identifier="read").books.first()) + self.assertEqual( + shelf.shelfbook_set.first().shelved_date, make_date(2020, 10, 21) + ) + readthrough = models.ReadThrough.objects.get(user=self.user) self.assertEqual(readthrough.book, self.book) - self.assertEqual(readthrough.start_date.year, 2020) - self.assertEqual(readthrough.start_date.month, 10) - self.assertEqual(readthrough.start_date.day, 21) - self.assertEqual(readthrough.finish_date.year, 2020) - self.assertEqual(readthrough.finish_date.month, 10) - self.assertEqual(readthrough.finish_date.day, 25) + self.assertEqual(readthrough.start_date, make_date(2020, 10, 21)) + self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25)) - def test_handle_import_twice(self): + 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, + shelved_date=make_date(2020, 2, 2), + ) + + import_job = models.ImportJob.objects.create(user=self.user) + 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"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + + shelf.refresh_from_db() + self.assertEqual(shelf.books.first(), self.book) + self.assertEqual( + shelf.shelfbook_set.first().shelved_date, make_date(2020, 2, 2) + ) + 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, make_date(2020, 10, 21)) + self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25)) + + 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) @@ -187,30 +196,27 @@ class GoodreadsImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) + self.assertEqual( + shelf.shelfbook_set.first().shelved_date, make_date(2020, 10, 21) + ) 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, 2020) - self.assertEqual(readthrough.start_date.month, 10) - self.assertEqual(readthrough.start_date.day, 21) - self.assertEqual(readthrough.finish_date.year, 2020) - self.assertEqual(readthrough.finish_date.month, 10) - self.assertEqual(readthrough.finish_date.day, 25) + self.assertEqual(readthrough.start_date, make_date(2020, 10, 21)) + self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25)) @patch("bookwyrm.activitystreams.ActivityStream.add_status") - def test_handle_imported_book_review(self, _): + 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") @@ -221,21 +227,18 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + 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) - self.assertEqual(review.published_date.year, 2019) - self.assertEqual(review.published_date.month, 7) - self.assertEqual(review.published_date.day, 8) + self.assertEqual(review.published_date, make_date(2019, 7, 8)) self.assertEqual(review.privacy, "unlisted") @patch("bookwyrm.activitystreams.ActivityStream.add_status") - def test_handle_imported_book_rating(self, _): + 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( @@ -248,20 +251,17 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + 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.published_date, make_date(2019, 7, 8)) self.assertEqual(review.privacy, "unlisted") - def test_handle_imported_book_reviews_disabled(self): + 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") @@ -272,11 +272,10 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + 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/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 8e299d567..504951c2f 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -2,6 +2,8 @@ import csv import pathlib from unittest.mock import patch +import datetime +import pytz from django.test import TestCase import responses @@ -12,6 +14,13 @@ from bookwyrm.importers.importer import import_data, handle_imported_book from bookwyrm.settings import DOMAIN +def make_date(*args): + """helper function to easily generate a date obj""" + return datetime.datetime(*args, tzinfo=pytz.UTC) + + +# pylint: disable=consider-using-with +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class LibrarythingImport(TestCase): """importing from librarything tsv""" @@ -22,7 +31,7 @@ class LibrarythingImport(TestCase): # Librarything generates latin encoded exports... self.csv = open(datafile, "r", encoding=self.importer.encoding) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.user = models.User.objects.create_user( "mmai", "mmai@mmai.mmai", "password", local=True ) @@ -38,15 +47,14 @@ class LibrarythingImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_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, - ) + 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): + 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) @@ -62,7 +70,7 @@ class LibrarythingImport(TestCase): self.assertEqual(import_items[2].index, 2) self.assertEqual(import_items[2].data["Book Id"], "5015399") - def test_create_retry_job(self): + 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] @@ -81,11 +89,10 @@ class LibrarythingImport(TestCase): self.assertEqual(retry_items[1].data["Book Id"], "5015319") @responses.activate - def test_import_data(self): + def test_import_data(self, _): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create(title="Test Book") + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -97,7 +104,7 @@ class LibrarythingImport(TestCase): 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): + 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()) @@ -114,26 +121,20 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + 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) + self.assertEqual(readthrough.start_date, make_date(2007, 4, 16)) + self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8)) - def test_handle_imported_book_already_shelved(self): + 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() @@ -151,25 +152,21 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + 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) + self.assertEqual(readthrough.start_date, make_date(2007, 4, 16)) + self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8)) - def test_handle_import_twice(self): + 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) @@ -184,30 +181,24 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + 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) + self.assertEqual(readthrough.start_date, make_date(2007, 4, 16)) + self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8)) @patch("bookwyrm.activitystreams.ActivityStream.add_status") - def test_handle_imported_book_review(self, _): + 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") @@ -218,20 +209,17 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + 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.published_date, make_date(2007, 5, 8)) self.assertEqual(review.privacy, "unlisted") - def test_handle_imported_book_reviews_disabled(self): + 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") @@ -242,11 +230,10 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + 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/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index 1705cd348..c080e3fe5 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -12,7 +12,7 @@ class Activitystreams(TestCase): def setUp(self): """we need some stuff""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) @@ -23,18 +23,17 @@ class Activitystreams(TestCase): 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", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test book") + 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_populate_streams(self, _): """make sure the function on the redis manager gets called""" @@ -47,4 +46,4 @@ class Activitystreams(TestCase): "bookwyrm.activitystreams.ActivityStream.populate_store" ) as redis_mock: populate_streams() - self.assertEqual(redis_mock.call_count, 6) # 2 users x 3 streams + self.assertEqual(redis_mock.call_count, 4) # 2 users x 2 streams diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 553ca5469..01d06e02f 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -21,28 +21,28 @@ from bookwyrm.settings import PAGE_LENGTH # pylint: disable=invalid-name @patch("bookwyrm.activitystreams.ActivityStream.add_status") -@patch("bookwyrm.preview_images.generate_user_preview_image_task.delay") +@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") class ActivitypubMixins(TestCase): """functionality shared across models""" def setUp(self): """shared data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): 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" - 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.local_user.remote_id = "http://example.com/a/b" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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.object_mock = { "to": "to field", @@ -78,22 +78,20 @@ class ActivitypubMixins(TestCase): """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 - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + book = models.Edition.objects.create( + 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") # uses subclasses - 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", - ) + models.Comment.objects.create( + user=self.local_user, + content="test status", + book=book, + remote_id="https://comment.net", + ) result = models.User.find_existing_by_remote_id("hi") self.assertIsNone(result) @@ -110,11 +108,10 @@ class ActivitypubMixins(TestCase): def test_find_existing(self, *_): """match a blob of data to a model""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test edition", - openlibrary_key="OL1234", - ) + book = models.Edition.objects.create( + title="Test edition", + openlibrary_key="OL1234", + ) result = models.Edition.find_existing({"openlibraryKey": "OL1234"}) self.assertEqual(result, book) @@ -193,7 +190,7 @@ class ActivitypubMixins(TestCase): 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) + self.remote_user.save(broadcast=False, update_fields=["shared_inbox"]) with patch("bookwyrm.models.user.set_remote_server.delay"): another_remote_user = models.User.objects.create_user( "nutria", @@ -369,7 +366,6 @@ class ActivitypubMixins(TestCase): self.assertEqual(activity["type"], "Undo") self.assertIsInstance(activity["object"], dict) - @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") def test_to_ordered_collection_page(self, *_): """make sure the paged results of an ordered collection work""" self.assertEqual(PAGE_LENGTH, 15) @@ -395,7 +391,6 @@ class ActivitypubMixins(TestCase): self.assertEqual(page_2.orderedItems[0]["content"], "test status 14") self.assertEqual(page_2.orderedItems[-1]["content"], "test status 0") - @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") def test_to_ordered_collection(self, *_): """convert a queryset into an ordered collection object""" self.assertEqual(PAGE_LENGTH, 15) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 496a86104..43cd5d3f4 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -7,25 +7,26 @@ from bookwyrm.models import base_model from bookwyrm.settings import DOMAIN +# pylint: disable=attribute-defined-outside-init class BaseModel(TestCase): """functionality shared across models""" def setUp(self): """shared data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): 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", - ) + 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", + ) class BookWyrmTestModel(base_model.BookWyrmModel): """just making it not abstract""" diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index 9408220e0..cad00d43a 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -1,6 +1,4 @@ """ testing models """ -from unittest.mock import patch - from dateutil.parser import parse from django.test import TestCase from django.utils import timezone @@ -14,18 +12,17 @@ class Book(TestCase): def setUp(self): """we'll need some books""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create( - title="Example Work", remote_id="https://example.com/book/1" - ) - self.first_edition = models.Edition.objects.create( - title="Example Edition", - parent_work=self.work, - ) - self.second_edition = models.Edition.objects.create( - title="Another Example Edition", - parent_work=self.work, - ) + self.work = models.Work.objects.create( + title="Example Work", remote_id="https://example.com/book/1" + ) + self.first_edition = models.Edition.objects.create( + title="Example Edition", + parent_work=self.work, + ) + self.second_edition = models.Edition.objects.create( + title="Another Example Edition", + parent_work=self.work, + ) def test_remote_id(self): """fanciness with remote/origin ids""" @@ -59,8 +56,7 @@ class Book(TestCase): def test_get_edition_info(self): """text slug about an edition""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create(title="Test Edition") + book = models.Edition.objects.create(title="Test Edition") self.assertEqual(book.edition_info, "") book.physical_format = "worm" diff --git a/bookwyrm/tests/models/test_federated_server.py b/bookwyrm/tests/models/test_federated_server.py index fabd69eea..43724568d 100644 --- a/bookwyrm/tests/models/test_federated_server.py +++ b/bookwyrm/tests/models/test_federated_server.py @@ -11,30 +11,29 @@ class FederatedServer(TestCase): def setUp(self): """we'll need a user""" self.server = models.FederatedServer.objects.create(server_name="test.server") - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - 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", - ) + 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""" diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index 339d35685..2520a2fd2 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -24,10 +24,11 @@ from bookwyrm.models.base_model import BookWyrmModel from bookwyrm.models.activitypub_mixin import ActivitypubMixin # pylint: disable=too-many-public-methods -class ActivitypubFields(TestCase): +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") +class ModelFields(TestCase): """overwrites standard model feilds to work with activitypub""" - def test_validate_remote_id(self): + 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")) @@ -44,7 +45,7 @@ class ActivitypubFields(TestCase): "http://www.example.com/dlfjg 23/x", ) - def test_activitypub_field_mixin(self): + def test_activitypub_field_mixin(self, _): """generic mixin with super basic to and from functionality""" instance = fields.ActivitypubFieldMixin() self.assertEqual(instance.field_to_activity("fish"), "fish") @@ -62,7 +63,7 @@ class ActivitypubFields(TestCase): instance.name = "snake_case_name" self.assertEqual(instance.get_activitypub_field(), "snakeCaseName") - def test_set_field_from_activity(self): + def test_set_field_from_activity(self, _): """setter from entire json blob""" @dataclass @@ -81,7 +82,7 @@ class ActivitypubFields(TestCase): instance.set_field_from_activity(mock_model, data) self.assertEqual(mock_model.field_name, "hi") - def test_set_activity_from_field(self): + def test_set_activity_from_field(self, _): """set json field given entire model""" @dataclass @@ -99,7 +100,7 @@ class ActivitypubFields(TestCase): instance.set_activity_from_field(data, mock_model) self.assertEqual(data["fieldName"], "bip") - def test_remote_id_field(self): + def test_remote_id_field(self, _): """just sets some defaults on charfield""" instance = fields.RemoteIdField() self.assertEqual(instance.max_length, 255) @@ -108,7 +109,7 @@ class ActivitypubFields(TestCase): with self.assertRaises(ValidationError): instance.run_validators("http://www.example.com/dlfjg 23/x") - def test_username_field(self): + def test_username_field(self, _): """again, just setting defaults on username field""" instance = fields.UsernameField() self.assertEqual(instance.activitypub_field, "preferredUsername") @@ -129,7 +130,7 @@ class ActivitypubFields(TestCase): self.assertEqual(instance.field_to_activity("test@example.com"), "test") - def test_privacy_field_defaults(self): + def test_privacy_field_defaults(self, _): """post privacy field's many default values""" instance = fields.PrivacyField() self.assertEqual(instance.max_length, 255) @@ -142,7 +143,7 @@ class ActivitypubFields(TestCase): instance.public, "https://www.w3.org/ns/activitystreams#Public" ) - def test_privacy_field_set_field_from_activity(self): + def test_privacy_field_set_field_from_activity(self, _): """translate between to/cc fields and privacy""" @dataclass(init=False) @@ -188,10 +189,9 @@ class ActivitypubFields(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_privacy_field_set_activity_from_field(self, *_): """translate between to/cc fields and privacy""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + 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 @@ -231,7 +231,7 @@ class ActivitypubFields(TestCase): self.assertEqual(activity["to"], [user.remote_id]) self.assertEqual(activity["cc"], []) - def test_foreign_key(self): + 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")) @@ -240,7 +240,7 @@ class ActivitypubFields(TestCase): self.assertEqual(instance.field_to_activity(item), "https://e.b/c") @responses.activate - def test_foreign_key_from_activity_str(self): + def test_foreign_key_from_activity_str(self, _): """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") @@ -249,26 +249,25 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - unrelated_user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + unrelated_user = User.objects.create_user( + "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") + # 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") 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!!") - def test_foreign_key_from_activity_dict(self): + def test_foreign_key_from_activity_dict(self, *_): """test recieving activity json""" instance = fields.ForeignKey(User, on_delete=models.CASCADE) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") @@ -277,60 +276,57 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - unrelated_user = User.objects.create_user( - "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)) + unrelated_user = User.objects.create_user( + "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!!") # et cetera but we're not testing serializing user json - def test_foreign_key_from_activity_dict_existing(self): + def test_foreign_key_from_activity_dict_existing(self, _): """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()) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - user.remote_id = "https://example.com/user/mouse" - user.save(broadcast=False) + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + user.remote_id = "https://example.com/user/mouse" + user.save(broadcast=False, update_fields=["remote_id"]) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) - with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): - value = instance.field_from_activity(activitypub.Person(**userdata)) + 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): + def test_foreign_key_from_activity_str_existing(self, _): """test receiving a remote id of an existing object in the db""" instance = fields.ForeignKey(User, on_delete=models.CASCADE) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + User.objects.create_user( + "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): + 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"}) - def test_many_to_many_field(self): + def test_many_to_many_field(self, _): """lists!""" instance = fields.ManyToManyField("User") @@ -348,7 +344,7 @@ class ActivitypubFields(TestCase): self.assertEqual(instance.field_to_activity(items), "example.com/snake_case") @responses.activate - def test_many_to_many_field_from_activity(self): + def test_many_to_many_field_from_activity(self, _): """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") @@ -360,16 +356,15 @@ class ActivitypubFields(TestCase): responses.add( responses.GET, "https://example.com/user/mouse", json=userdata, status=200 ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity( - ["https://example.com/user/mouse", "bleh"] - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity( + ["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): + def test_tag_field(self, _): """a special type of many to many field""" instance = fields.TagField("User") @@ -388,25 +383,25 @@ class ActivitypubFields(TestCase): self.assertEqual(result[0].name, "Name") self.assertEqual(result[0].type, "Serializable") - def test_tag_field_from_activity(self): + def test_tag_field_from_activity(self, _): """loadin' a list of items from Links""" # TODO @responses.activate @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast") - def test_image_field(self, _): + @patch("bookwyrm.suggested_users.remove_user_task.delay") + def test_image_field(self, *_): """storing images""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - 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) - user.avatar.save("test.jpg", ContentFile(output.getvalue())) + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + 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) + user.avatar.save("test.jpg", ContentFile(output.getvalue())) output = fields.image_serializer(user.avatar, alt="alt text") self.assertIsNotNone( @@ -433,7 +428,16 @@ class ActivitypubFields(TestCase): self.assertIsInstance(loaded_image, list) self.assertIsInstance(loaded_image[1], ContentFile) - def test_datetime_field(self): + def test_image_serialize(self, _): + """make sure we're creating sensible image paths""" + ValueMock = namedtuple("ValueMock", ("url")) + value_mock = ValueMock("/images/fish.jpg") + result = fields.image_serializer(value_mock, "hello") + self.assertEqual(result.type, "Document") + self.assertEqual(result.url, "https://your.domain.here/images/fish.jpg") + self.assertEqual(result.name, "hello") + + def test_datetime_field(self, _): """this one is pretty simple, it just has to use isoformat""" instance = fields.DateTimeField() now = timezone.now() @@ -441,12 +445,12 @@ class ActivitypubFields(TestCase): self.assertEqual(instance.field_from_activity(now.isoformat()), now) self.assertEqual(instance.field_from_activity("bip"), None) - def test_array_field(self): + def test_array_field(self, _): """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): + def test_html_field(self, _): """sanitizes html, the sanitizer has its own tests""" instance = fields.HtmlField() self.assertEqual( diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index be6702b31..15a75a96e 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -59,7 +59,7 @@ class ImportJob(TestCase): unknown_read_data["Exclusive Shelf"] = "read" unknown_read_data["Date Read"] = "" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) @@ -175,9 +175,6 @@ class ImportJob(TestCase): with patch( "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - book = self.item_1.get_book_from_isbn() + book = self.item_1.get_book_from_isbn() self.assertEqual(book.title, "Sabriel") diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index 34517ddcd..6e1ff8094 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -11,13 +11,12 @@ class List(TestCase): def setUp(self): """look, a list""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="hello") - self.book = models.Edition.objects.create(title="hi", parent_work=work) + 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""" diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index 186e7ad05..596753f79 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -1,7 +1,7 @@ """ testing models """ +from unittest.mock import patch from django.test import TestCase from django.core.exceptions import ValidationError -from unittest.mock import patch from bookwyrm import models @@ -11,16 +11,15 @@ class ReadThrough(TestCase): def setUp(self): """look, a shelf""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work - ) + self.work = models.Work.objects.create(title="Example Work") + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) self.readthrough = models.ReadThrough.objects.create( user=self.user, book=self.edition diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index 0a630dd12..f66cf1091 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -1,4 +1,5 @@ """ testing models """ +import json from unittest.mock import patch from django.test import TestCase @@ -10,36 +11,31 @@ class Relationship(TestCase): def setUp(self): """we need some users for this""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - 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.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.suggested_users.rerank_suggestions_task.delay"): 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" - self.local_user.save(broadcast=False) + self.local_user.remote_id = "http://local.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) def test_user_follows_from_request(self): """convert a follow request into a follow""" - real_broadcast = models.UserFollowRequest.broadcast - - def mock_broadcast(_, activity, user): - """introspect what's being sent out""" - self.assertEqual(user.remote_id, self.local_user.remote_id) - 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 - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock: + request = models.UserFollowRequest.objects.create( + user_subject=self.local_user, user_object=self.remote_user + ) + activity = json.loads(mock.call_args[0][1]) + self.assertEqual(activity["type"], "Follow") self.assertEqual( request.remote_id, "http://local.com/user/mouse#follows/%d" % request.id ) @@ -52,7 +48,6 @@ class Relationship(TestCase): 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""" @@ -71,36 +66,26 @@ class Relationship(TestCase): self.assertEqual(rel.user_subject, self.local_user) self.assertEqual(rel.user_object, self.remote_user) - def test_follow_request_activity(self): + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") + def test_follow_request_activity(self, broadcast_mock): """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") - - models.UserFollowRequest.broadcast = mock_broadcast models.UserFollowRequest.objects.create( user_subject=self.local_user, user_object=self.remote_user, ) - models.UserFollowRequest.broadcast = real_broadcast + activity = json.loads(broadcast_mock.call_args[0][1]) + self.assertEqual(activity["actor"], self.local_user.remote_id) + self.assertEqual(activity["object"], self.remote_user.remote_id) + self.assertEqual(activity["type"], "Follow") - def test_follow_request_accept(self): + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") + def test_follow_request_accept(self, broadcast_mock): """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.local_user.manually_approves_followers = True - self.local_user.save(broadcast=False) - models.UserFollowRequest.broadcast = mock_broadcast + self.local_user.save( + broadcast=False, update_fields=["manually_approves_followers"] + ) + request = models.UserFollowRequest.objects.create( user_subject=self.remote_user, user_object=self.local_user, @@ -108,32 +93,34 @@ class Relationship(TestCase): ) request.accept() + activity = json.loads(broadcast_mock.call_args[0][1]) + self.assertEqual(activity["type"], "Accept") + self.assertEqual(activity["actor"], self.local_user.remote_id) + self.assertEqual(activity["object"]["id"], "https://www.hi.com/") + self.assertFalse(models.UserFollowRequest.objects.exists()) self.assertTrue(models.UserFollows.objects.exists()) rel = models.UserFollows.objects.get() self.assertEqual(rel.user_subject, self.remote_user) self.assertEqual(rel.user_object, self.local_user) - models.UserFollowRequest.broadcast = real_broadcast - def test_follow_request_reject(self): + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") + def test_follow_request_reject(self, broadcast_mock): """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) - - models.UserFollowRequest.broadcast = mock_reject self.local_user.manually_approves_followers = True - self.local_user.save(broadcast=False) + self.local_user.save( + broadcast=False, update_fields=["manually_approves_followers"] + ) request = models.UserFollowRequest.objects.create( user_subject=self.remote_user, user_object=self.local_user, ) request.reject() + activity = json.loads(broadcast_mock.call_args[0][1]) + self.assertEqual(activity["type"], "Reject") + self.assertEqual(activity["actor"], self.local_user.remote_id) + self.assertEqual(activity["object"]["id"], request.remote_id) + self.assertFalse(models.UserFollowRequest.objects.exists()) self.assertFalse(models.UserFollows.objects.exists()) - models.UserFollowRequest.broadcast = real_broadcast diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index f5c255a63..f6fd68509 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -7,22 +7,20 @@ from bookwyrm import models, settings # pylint: disable=unused-argument +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class Shelf(TestCase): """some activitypub oddness ahead""" def setUp(self): """look, a shelf""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="test book", parent_work=work - ) + 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): + def test_remote_id(self, _): """shelves use custom remote ids""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): shelf = models.Shelf.objects.create( @@ -31,7 +29,7 @@ class Shelf(TestCase): expected_id = "https://%s/user/mouse/books/test-shelf" % settings.DOMAIN self.assertEqual(shelf.get_remote_id(), expected_id) - def test_to_activity(self): + def test_to_activity(self, _): """jsonify it""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): shelf = models.Shelf.objects.create( @@ -45,7 +43,7 @@ class Shelf(TestCase): self.assertEqual(activity_json["name"], "Test Shelf") self.assertEqual(activity_json["owner"], self.local_user.remote_id) - def test_create_update_shelf(self): + def test_create_update_shelf(self, _): """create and broadcast shelf creation""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock: @@ -66,7 +64,7 @@ class Shelf(TestCase): self.assertEqual(activity["object"]["name"], "arthur russel") self.assertEqual(shelf.name, "arthur russel") - def test_shelve(self): + def test_shelve(self, _): """create and broadcast shelf creation""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): shelf = models.Shelf.objects.create( diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index f8d49abc3..f8113549d 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -22,31 +22,30 @@ class Status(TestCase): def setUp(self): """useful things for creating a status""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): 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", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="Test Edition") - - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" + 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", ) - image = Image.open(image_file) - output = BytesIO() - with patch("bookwyrm.models.Status.broadcast"): - image.save(output, format=image.format) - self.book.cover.save("test.jpg", ContentFile(output.getvalue())) + self.book = models.Edition.objects.create(title="Test Edition") + + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + with patch("bookwyrm.models.Status.broadcast"): + image.save(output, format=image.format) + self.book.cover.save("test.jpg", ContentFile(output.getvalue())) def test_status_generated_fields(self, *_): """setting remote id""" @@ -61,10 +60,9 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -96,10 +94,9 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -256,15 +253,14 @@ class Status(TestCase): def test_review_to_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create( - name="Review name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity() + status = models.Review.objects.create( + name="Review name", + content="test content", + rating=3.0, + user=self.local_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) @@ -274,15 +270,14 @@ class Status(TestCase): def test_review_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create( - name="Review's name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + status = models.Review.objects.create( + name="Review's name", + content="test content", + 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"], "Article") self.assertEqual( @@ -299,14 +294,13 @@ class Status(TestCase): def test_review_to_pure_activity_no_rating(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create( - name="Review name", - content="test content", - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + 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( @@ -322,13 +316,12 @@ class Status(TestCase): def test_reviewrating_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.ReviewRating.objects.create( - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + 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( @@ -357,12 +350,11 @@ class Status(TestCase): status = models.Status.objects.create( content="test content", user=self.local_user ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - fav = models.Favorite.objects.create(status=status, 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.local_user) + # can't fav a status twice + with self.assertRaises(IntegrityError): + models.Favorite.objects.create(status=status, user=self.local_user) activity = fav.to_activity() self.assertEqual(activity["type"], "Like") diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index b6c716638..177b2ad62 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -11,7 +11,7 @@ from bookwyrm.settings import DOMAIN # pylint: disable=missing-function-docstring class User(TestCase): def setUp(self): - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.user = models.User.objects.create_user( "mouse@%s" % DOMAIN, "mouse@mouse.mouse", @@ -35,16 +35,15 @@ class User(TestCase): self.assertIsNotNone(self.user.key_pair.public_key) def test_remote_user(self): - with patch("bookwyrm.preview_images.generate_user_preview_image_task.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, - ) + 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") def test_user_shelves(self): @@ -156,7 +155,8 @@ class User(TestCase): self.assertIsNone(server.application_type) self.assertIsNone(server.application_version) - def test_delete_user(self): + @patch("bookwyrm.suggested_users.remove_user_task.delay") + def test_delete_user(self, _): """deactivate a user""" self.assertTrue(self.user.is_active) with patch( diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py index da335e894..ac57d8b3d 100644 --- a/bookwyrm/tests/test_activitystreams.py +++ b/bookwyrm/tests/test_activitystreams.py @@ -6,12 +6,14 @@ from bookwyrm import activitystreams, models @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") @patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.activitystreams.BooksStream.add_book_statuses") +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class Activitystreams(TestCase): """using redis to build activity streams""" def setUp(self): """use a test csv""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) @@ -22,18 +24,18 @@ class Activitystreams(TestCase): 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", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test book") + 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", + ) + work = models.Work.objects.create(title="test work") + self.book = models.Edition.objects.create(title="test book", parent_work=work) class TestStream(activitystreams.ActivityStream): """test stream, don't have to do anything here""" @@ -192,19 +194,95 @@ class Activitystreams(TestCase): users = activitystreams.LocalStream().get_audience(status) self.assertEqual(users, []) - def test_federatedstream_get_audience(self, *_): + def test_localstream_get_audience_books_no_book(self, *_): """get a list of users that should see a status""" status = models.Status.objects.create( - user=self.remote_user, content="hi", privacy="public" + user=self.local_user, content="hi", privacy="public" ) - users = activitystreams.FederatedStream().get_audience(status) - self.assertTrue(self.local_user in users) - self.assertTrue(self.another_user in users) + audience = activitystreams.BooksStream().get_audience(status) + # no books, no audience + self.assertEqual(audience, []) - def test_federatedstream_get_audience_unlisted(self, *_): + def test_localstream_get_audience_books_mention_books(self, *_): """get a list of users that should see a status""" status = models.Status.objects.create( - user=self.remote_user, content="hi", privacy="unlisted" + user=self.local_user, content="hi", privacy="public" ) - users = activitystreams.FederatedStream().get_audience(status) - self.assertEqual(users, []) + status.mention_books.add(self.book) + status.save(broadcast=False) + models.ShelfBook.objects.create( + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + book=self.book, + ) + # yes book, yes audience + audience = activitystreams.BooksStream().get_audience(status) + self.assertTrue(self.local_user in audience) + + def test_localstream_get_audience_books_book_field(self, *_): + """get a list of users that should see a status""" + status = models.Comment.objects.create( + user=self.local_user, content="hi", privacy="public", book=self.book + ) + models.ShelfBook.objects.create( + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + book=self.book, + ) + # yes book, yes audience + audience = activitystreams.BooksStream().get_audience(status) + self.assertTrue(self.local_user in audience) + + def test_localstream_get_audience_books_alternate_edition(self, *_): + """get a list of users that should see a status""" + alt_book = models.Edition.objects.create( + title="hi", parent_work=self.book.parent_work + ) + status = models.Comment.objects.create( + user=self.remote_user, content="hi", privacy="public", book=alt_book + ) + models.ShelfBook.objects.create( + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + book=self.book, + ) + # yes book, yes audience + audience = activitystreams.BooksStream().get_audience(status) + self.assertTrue(self.local_user in audience) + + def test_localstream_get_audience_books_non_public(self, *_): + """get a list of users that should see a status""" + alt_book = models.Edition.objects.create( + title="hi", parent_work=self.book.parent_work + ) + status = models.Comment.objects.create( + user=self.remote_user, content="hi", privacy="unlisted", book=alt_book + ) + models.ShelfBook.objects.create( + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + book=self.book, + ) + # yes book, yes audience + audience = activitystreams.BooksStream().get_audience(status) + self.assertEqual(audience, []) + + def test_get_statuses_for_user_books(self, *_): + """create a stream for a user""" + alt_book = models.Edition.objects.create( + title="hi", parent_work=self.book.parent_work + ) + status = models.Status.objects.create( + user=self.local_user, content="hi", privacy="public" + ) + status = models.Comment.objects.create( + user=self.remote_user, content="hi", privacy="public", book=alt_book + ) + models.ShelfBook.objects.create( + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + book=self.book, + ) + # yes book, yes audience + result = activitystreams.BooksStream().get_statuses_for_user(self.local_user) + self.assertEqual(list(result), [status]) diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index e7b1bb1ca..4c3d86a46 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -3,7 +3,6 @@ from unittest.mock import patch from django.test import TestCase from django.test.client import RequestFactory -import responses from bookwyrm import emailing, models @@ -15,7 +14,7 @@ class Emailing(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -23,8 +22,7 @@ class Emailing(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_invite_email(self, email_mock): """load the invite email""" diff --git a/bookwyrm/tests/test_postgres.py b/bookwyrm/tests/test_postgres.py index 98385d34b..70775d47e 100644 --- a/bookwyrm/tests/test_postgres.py +++ b/bookwyrm/tests/test_postgres.py @@ -6,17 +6,16 @@ from bookwyrm import models @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") -@patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay") class PostgresTriggers(TestCase): """special migrations, fancy stuff ya know""" - def test_search_vector_on_create(self, *_): + def test_search_vector_on_create(self, _): """make sure that search_vector is being set correctly on create""" book = models.Edition.objects.create(title="The Long Goodbye") book.refresh_from_db() self.assertEqual(book.search_vector, "'goodby':3A 'long':2A") - def test_search_vector_on_update(self, *_): + def test_search_vector_on_update(self, _): """make sure that search_vector is being set correctly on edit""" book = models.Edition.objects.create(title="The Long Goodbye") book.title = "The Even Longer Goodbye" @@ -24,7 +23,7 @@ class PostgresTriggers(TestCase): book.refresh_from_db() self.assertEqual(book.search_vector, "'even':2A 'goodby':4A 'longer':3A") - def test_search_vector_fields(self, *_): + def test_search_vector_fields(self, _): """use multiple fields to create search vector""" author = models.Author.objects.create(name="The Rays") book = models.Edition.objects.create( @@ -40,7 +39,7 @@ class PostgresTriggers(TestCase): "'cool':5B 'goodby':3A 'long':2A 'name':9 'rays':7C 'seri':8 'the':6C 'wow':4B", ) - def test_seach_vector_on_author_update(self, *_): + def test_seach_vector_on_author_update(self, _): """update search when an author name changes""" author = models.Author.objects.create(name="The Rays") book = models.Edition.objects.create( @@ -53,7 +52,7 @@ class PostgresTriggers(TestCase): self.assertEqual(book.search_vector, "'goodby':3A 'jeremy':4C 'long':2A") - def test_seach_vector_on_author_delete(self, *_): + def test_seach_vector_on_author_delete(self, _): """update search when an author name changes""" author = models.Author.objects.create(name="Jeremy") book = models.Edition.objects.create( @@ -68,7 +67,7 @@ class PostgresTriggers(TestCase): book.refresh_from_db() self.assertEqual(book.search_vector, "'goodby':3A 'long':2A") - def test_search_vector_stop_word_fallback(self, *_): + def test_search_vector_stop_word_fallback(self, _): """use a fallback when removing stop words leads to an empty vector""" book = models.Edition.objects.create( title="there there", diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index ac9e3f1c5..37638c27c 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -9,7 +9,6 @@ from django.core.files.uploadedfile import SimpleUploadedFile from django.db.models.fields.files import ImageFieldFile from bookwyrm import models, settings - from bookwyrm.preview_images import ( generate_site_preview_image_task, generate_edition_preview_image_task, @@ -27,10 +26,10 @@ class PreviewImages(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - avatar_file = pathlib.Path(__file__).parent.joinpath( - "../static/images/no_cover.jpg" - ) + avatar_file = pathlib.Path(__file__).parent.joinpath( + "../static/images/no_cover.jpg" + ) + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "possum@local.com", "possum@possum.possum", @@ -43,15 +42,17 @@ class PreviewImages(TestCase): content_type="image/jpeg", ), ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.edition = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.site = models.SiteSettings.objects.create() + + self.work = models.Work.objects.create(title="Test Work") + self.edition = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + + self.site = models.SiteSettings.objects.create() + + settings.ENABLE_PREVIEW_IMAGES = True def test_generate_preview_image(self, *args, **kwargs): image_file = pathlib.Path(__file__).parent.joinpath( diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index b9b1af261..d9a87dd56 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -37,7 +37,7 @@ class Signature(TestCase): def setUp(self): """create users and test data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.mouse = models.User.objects.create_user( "mouse@%s" % DOMAIN, "mouse@example.com", @@ -58,8 +58,7 @@ class Signature(TestCase): "http://localhost/user/remote", KeyPair(private_key, public_key) ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def send(self, signature, now, data, digest): """test request""" @@ -119,10 +118,9 @@ class Signature(TestCase): status=200, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.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) + 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): @@ -143,23 +141,22 @@ class Signature(TestCase): data["publicKey"]["publicKeyPem"] = key_pair.public_key responses.add(responses.GET, self.fake_remote.remote_id, json=data, status=200) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.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) + 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) - # Old key is cached, so still works: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + # Old key is cached, so still works: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) - # Try with new key: - response = self.send_test_request(sender=new_sender) - self.assertEqual(response.status_code, 200) + # Try with new key: + response = self.send_test_request(sender=new_sender) + self.assertEqual(response.status_code, 200) - # Now the old key will fail: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 401) + # Now the old key will fail: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 401) @responses.activate def test_nonexistent_signer(self): diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py new file mode 100644 index 000000000..7e4a9d00f --- /dev/null +++ b/bookwyrm/tests/test_suggested_users.py @@ -0,0 +1,173 @@ +""" testing user follow suggestions """ +from collections import namedtuple +from unittest.mock import patch + +from django.db.models import Q +from django.test import TestCase + +from bookwyrm import models +from bookwyrm.suggested_users import suggested_users, get_annotated_users + + +@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") +@patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") +@patch("bookwyrm.suggested_users.rerank_user_task.delay") +@patch("bookwyrm.suggested_users.remove_user_task.delay") +class SuggestedUsers(TestCase): + """using redis to build activity streams""" + + def setUp(self): + """use a test csv""" + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + ) + + def test_get_rank(self, *_): + """a float that reflects both the mutuals count and shared books""" + Mock = namedtuple("AnnotatedUserMock", ("mutuals", "shared_books")) + annotated_user_mock = Mock(3, 27) + rank = suggested_users.get_rank(annotated_user_mock) + self.assertEqual(rank, 3) # 3.9642857142857144) + + def test_store_id(self, *_): + """redis key generation""" + self.assertEqual( + suggested_users.store_id(self.local_user), + "{:d}-suggestions".format(self.local_user.id), + ) + + def test_get_counts_from_rank(self, *_): + """reverse the rank computation to get the mutuals and shared books counts""" + counts = suggested_users.get_counts_from_rank(3.9642857142857144) + self.assertEqual(counts["mutuals"], 3) + # self.assertEqual(counts["shared_books"], 27) + + def test_get_objects_for_store(self, *_): + """list of people to follow for a given user""" + + mutual_user = models.User.objects.create_user( + "rat", "rat@local.rat", "password", local=True, localname="rat" + ) + suggestable_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + discoverable=True, + ) + + # you follow rat + mutual_user.followers.add(self.local_user) + # rat follows the suggested user + suggestable_user.followers.add(mutual_user) + + results = suggested_users.get_objects_for_store( + "{:d}-suggestions".format(self.local_user.id) + ) + self.assertEqual(results.count(), 1) + match = results.first() + self.assertEqual(match.id, suggestable_user.id) + self.assertEqual(match.mutuals, 1) + + def test_create_user_signal(self, *_): + """build suggestions for new users""" + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") as mock: + models.User.objects.create_user( + "nutria", "nutria@nu.tria", "password", local=True, localname="nutria" + ) + + self.assertEqual(mock.call_count, 1) + + def test_get_annotated_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", + ) + work = models.Work.objects.create(title="Test Work") + book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=work, + ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + # 1 shared follow + self.local_user.following.add(user_2) + user_1.followers.add(user_2) + + # 1 shared book + 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 = get_annotated_users(self.local_user) + self.assertEqual(result.count(), 1) + self.assertTrue(user_1 in result) + self.assertFalse(user_2 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) + + def test_get_annotated_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.following.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 = get_annotated_users( + self.local_user, + ~Q(id=self.local_user.id), + ~Q(followers=self.local_user), + ) + user_1_annotated = result.get(id=user_1.id) + self.assertEqual(user_1_annotated.mutuals, 3) diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index 2e10d9308..d75d368c1 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -22,7 +22,7 @@ class TemplateTags(TestCase): def setUp(self): """create some filler objects""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", @@ -30,22 +30,20 @@ class TemplateTags(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.rat", - "ratword", - remote_id="http://example.com/rat", - local=False, - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="Test Book") + 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_get_user_rating(self, *_): """get a user's most recent rating of a book""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.Review.objects.create(user=self.user, book=self.book, rating=3) + 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, *_): @@ -63,30 +61,27 @@ class TemplateTags(TestCase): utilities.get_user_identifier(self.remote_user), "rat@example.com" ) + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") def test_get_replies(self, *_): """direct replies to a status""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) - first_child = models.Status.objects.create( - reply_parent=parent, user=self.user, content="hi" + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) + first_child = models.Status.objects.create( + reply_parent=parent, user=self.user, content="hi" + ) + second_child = models.Status.objects.create( + reply_parent=parent, user=self.user, content="hi" + ) + with patch( + "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" + ): + third_child = models.Status.objects.create( + reply_parent=parent, + user=self.user, + deleted=True, + deleted_date=timezone.now(), ) - second_child = models.Status.objects.create( - reply_parent=parent, user=self.user, content="hi" - ) - with patch( - "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" - ): - third_child = models.Status.objects.create( - reply_parent=parent, - user=self.user, - deleted=True, - deleted_date=timezone.now(), - ) replies = status_display.get_replies(parent) self.assertEqual(len(replies), 2) @@ -97,12 +92,9 @@ class TemplateTags(TestCase): def test_get_parent(self, *_): """get the reply parent of a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) child = models.Status.objects.create( reply_parent=parent, user=self.user, content="hi" ) @@ -113,8 +105,7 @@ class TemplateTags(TestCase): def test_get_user_liked(self, *_): """did a user like a status""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create(user=self.remote_user, book=self.book) + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_liked(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -123,8 +114,7 @@ class TemplateTags(TestCase): def test_get_user_boosted(self, *_): """did a user boost a status""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create(user=self.remote_user, book=self.book) + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_boosted(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -133,34 +123,28 @@ class TemplateTags(TestCase): def test_get_boosted(self, *_): """load a boosted status""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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 - ) + 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 = status_display.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""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book.parent_work = work - self.book.save() + 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)) + self.assertIsNone(bookwyrm_tags.get_book_description(self.book)) - work.description = "hi" - work.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") + work.description = "hi" + work.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") - self.book.description = "hello" - self.book.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") + self.book.description = "hello" + self.book.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") def test_get_uuid(self, *_): """uuid functionality""" @@ -191,3 +175,10 @@ class TemplateTags(TestCase): result = bookwyrm_tags.related_status(notification) self.assertIsInstance(result, models.Status) + + def test_get_next_shelf(self, *_): + """self progress helper""" + self.assertEqual(bookwyrm_tags.get_next_shelf("to-read"), "reading") + self.assertEqual(bookwyrm_tags.get_next_shelf("reading"), "read") + self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "read") + self.assertEqual(bookwyrm_tags.get_next_shelf("blooooga"), "to-read") diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index 0ac813bb1..8e49d25a4 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -19,7 +19,7 @@ class Inbox(TestCase): self.client = Client() self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -27,18 +27,18 @@ class Inbox(TestCase): local=True, localname="mouse", ) - 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", - ) + local_user.remote_id = "https://example.com/user/mouse" + local_user.save(broadcast=False, update_fields=["remote_id"]) + 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", @@ -47,8 +47,7 @@ class Inbox(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_inbox_invalid_get(self): """shouldn't try to handle if the user is not found""" @@ -146,7 +145,8 @@ class Inbox(TestCase): ) self.assertTrue(views.inbox.is_blocked_activity(activity)) - def test_create_by_deactivated_user(self): + @patch("bookwyrm.suggested_users.remove_user_task.delay") + 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) diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 2862fdf57..07525c34e 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -13,7 +13,7 @@ class InboxAdd(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -21,27 +21,27 @@ class InboxAdd(TestCase): local=True, localname="mouse", ) - 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", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( - title="Test", - remote_id="https://example.com/book/37292", - parent_work=work, + local_user.remote_id = "https://example.com/user/mouse" + local_user.save(broadcast=False, update_fields=["remote_id"]) + 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.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + work = models.Work.objects.create(title="work title") + self.book = models.Edition.objects.create( + title="Test", + remote_id="https://example.com/book/37292", + parent_work=work, + ) + + models.SiteSettings.objects.create() @responses.activate def test_handle_add_book_to_shelf(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 43900e339..8bc6cd1d0 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -13,7 +13,7 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -21,26 +21,26 @@ class InboxActivities(TestCase): 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", + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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", @@ -50,8 +50,8 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() @patch("bookwyrm.activitystreams.ActivityStream.add_status") @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") @@ -88,13 +88,12 @@ class InboxActivities(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") def test_boost_remote_status(self, redis_mock, _): """boost a status from a remote server""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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", diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 8c12e42bf..ce650a007 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -12,7 +12,7 @@ class InboxBlock(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -20,20 +20,20 @@ class InboxBlock(TestCase): 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.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index ed5e6f937..f93354bfb 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -10,12 +10,13 @@ from bookwyrm.activitypub import ActivitySerializerError # pylint: disable=too-many-public-methods +@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") class InboxCreate(TestCase): """readthrough tests""" def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -23,25 +24,18 @@ class InboxCreate(TestCase): 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.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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", @@ -51,22 +45,18 @@ class InboxCreate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() - def test_create_status(self): + def test_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()) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - models.Edition.objects.create( - title="Test Book", remote_id="https://example.com/book/1" - ) + models.Edition.objects.create( + title="Test Book", remote_id="https://example.com/book/1" + ) activity = self.create_json activity["object"] = status_data @@ -81,15 +71,13 @@ class InboxCreate(TestCase): 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_create_status_remote_note_with_mention(self): - """should only create it under the right circumstances""" self.assertEqual(models.Status.objects.count(), 1) + + def test_create_status_remote_note_with_mention(self, _): + """should only create it under the right circumstances""" self.assertFalse( models.Notification.objects.filter(user=self.local_user).exists() ) @@ -110,15 +98,22 @@ class InboxCreate(TestCase): ) self.assertEqual(models.Notification.objects.get().notification_type, "MENTION") - def test_create_status_remote_note_with_reply(self): + def test_create_status_remote_note_with_reply(self, _): """should only create it under the right circumstances""" + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + parent_status = models.Status.objects.create( + user=self.local_user, + content="Test status", + remote_id="https://example.com/status/1", + ) + 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 + status_data["inReplyTo"] = parent_status.remote_id activity = self.create_json activity["object"] = status_data @@ -127,16 +122,15 @@ class InboxCreate(TestCase): 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.assertEqual(status.reply_parent, parent_status) self.assertTrue(models.Notification.objects.filter(user=self.local_user)) self.assertEqual(models.Notification.objects.get().notification_type, "REPLY") - def test_create_rating(self): + def test_create_rating(self, _): """a remote rating activity""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test Book", remote_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"] = { "id": "https://example.com/user/mouse/reviewrating/12", @@ -149,8 +143,8 @@ class InboxCreate(TestCase): "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", + "first": "https://example.com/u/mouse/reviewrating/12/replies?page=1", + "last": "https://example.com/u/mouse/reviewrating/12/replies?page=1", "@context": "https://www.w3.org/ns/activitystreams", }, "inReplyTo": "", @@ -162,17 +156,14 @@ class InboxCreate(TestCase): "rating": 3, "@context": "https://www.w3.org/ns/activitystreams", } - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch( - "bookwyrm.activitystreams.ActivityStream.add_status" - ) as redis_mock: - views.inbox.activity_task(activity) - self.assertTrue(redis_mock.called) + with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: + views.inbox.activity_task(activity) + self.assertTrue(redis_mock.called) rating = models.ReviewRating.objects.first() self.assertEqual(rating.book, book) self.assertEqual(rating.rating, 3.0) - def test_create_list(self): + def test_create_list(self, _): """a new list""" activity = self.create_json activity["object"] = { @@ -196,7 +187,7 @@ class InboxCreate(TestCase): self.assertEqual(book_list.description, "summary text") self.assertEqual(book_list.remote_id, "https://example.com/list/22") - def test_create_unsupported_type(self): + def test_create_unsupported_type(self, _): """ignore activities we know we can't handle""" activity = self.create_json activity["object"] = { @@ -206,7 +197,7 @@ class InboxCreate(TestCase): # just observer how it doesn't throw an error views.inbox.activity_task(activity) - def test_create_unknown_type(self): + def test_create_unknown_type(self, _): """ignore activities we know we've never heard of""" activity = self.create_json activity["object"] = { diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 067a30ad3..1566c05a2 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -13,7 +13,7 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -21,18 +21,18 @@ class InboxActivities(TestCase): 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", - ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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, @@ -48,8 +48,7 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_delete_status(self): """remove a status""" @@ -107,7 +106,8 @@ class InboxActivities(TestCase): self.assertEqual(models.Notification.objects.count(), 1) self.assertEqual(models.Notification.objects.get(), notif) - def test_delete_user(self): + @patch("bookwyrm.suggested_users.remove_user_task.delay") + def test_delete_user(self, _): """delete a user""" self.assertTrue(models.User.objects.get(username="rat@example.com").is_active) activity = { @@ -119,8 +119,7 @@ class InboxActivities(TestCase): "object": self.remote_user.remote_id, } - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - views.inbox.activity_task(activity) + views.inbox.activity_task(activity) self.assertFalse(models.User.objects.get(username="rat@example.com").is_active) def test_delete_user_unknown(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index 063ad5d39..d1a4e0d00 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -13,7 +13,7 @@ class InboxRelationships(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -21,21 +21,20 @@ class InboxRelationships(TestCase): 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", - ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_follow(self): """remote user wants to follow local user""" @@ -104,7 +103,9 @@ class InboxRelationships(TestCase): } self.local_user.manually_approves_followers = True - self.local_user.save(broadcast=False) + self.local_user.save( + broadcast=False, update_fields=["manually_approves_followers"] + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): views.inbox.activity_task(activity) @@ -126,7 +127,9 @@ class InboxRelationships(TestCase): 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) + self.local_user.save( + broadcast=False, update_fields=["manually_approves_followers"] + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): request = models.UserFollowRequest.objects.create( user_subject=self.remote_user, user_object=self.local_user diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index 5d072fb0c..56f21e894 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -12,7 +12,7 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -20,18 +20,18 @@ class InboxActivities(TestCase): 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", - ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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"): @@ -50,8 +50,7 @@ class InboxActivities(TestCase): "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_handle_favorite(self): """fav a status""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index 2812ef1ff..3d64fcb23 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -12,7 +12,7 @@ class InboxRemove(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -20,29 +20,27 @@ class InboxRemove(TestCase): 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.preview_images.generate_edition_preview_image_task.delay"): - 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, + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + 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""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index db9b0ca0b..4abb0fa0d 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -14,7 +14,7 @@ class InboxUpdate(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -22,18 +22,18 @@ class InboxUpdate(TestCase): 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", - ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + 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", @@ -43,8 +43,8 @@ class InboxUpdate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_update_list(self): """a new list""" @@ -80,7 +80,8 @@ class InboxUpdate(TestCase): self.assertEqual(book_list.description, "summary text") self.assertEqual(book_list.remote_id, "https://example.com/list/22") - def test_update_user(self): + @patch("bookwyrm.suggested_users.rerank_user_task.delay") + def test_update_user(self, _): """update an existing user""" models.UserFollows.objects.create( user_subject=self.local_user, @@ -99,17 +100,16 @@ class InboxUpdate(TestCase): self.assertIsNone(self.remote_user.name) self.assertFalse(self.remote_user.discoverable) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - 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.remote_user.id) self.assertEqual(user.name, "RAT???") self.assertEqual(user.username, "rat@example.com") @@ -124,28 +124,27 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json") bookdata = json.loads(datafile.read_bytes()) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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" - ) + 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") + 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.last_edited_by, self.remote_user) @@ -155,10 +154,9 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json") bookdata = json.loads(datafile.read_bytes()) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Work.objects.create( - title="Test Book", remote_id="https://bookwyrm.social/book/5988" - ) + book = models.Work.objects.create( + title="Test Book", remote_id="https://bookwyrm.social/book/5988" + ) del bookdata["authors"] self.assertEqual(book.title, "Test Book") diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py index e25923949..16ef81e9c 100644 --- a/bookwyrm/tests/views/test_announcements.py +++ b/bookwyrm/tests/views/test_announcements.py @@ -1,8 +1,8 @@ """ 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 unittest.mock import patch from bookwyrm import forms, models, views @@ -13,7 +13,7 @@ class AnnouncementViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -21,8 +21,8 @@ class AnnouncementViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_announcements_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py index 94213c610..22008e100 100644 --- a/bookwyrm/tests/views/test_authentication.py +++ b/bookwyrm/tests/views/test_authentication.py @@ -8,20 +8,21 @@ 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 from bookwyrm.settings import DOMAIN # pylint: disable=too-many-public-methods +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class AuthenticationViews(TestCase): """login and password management""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( - "mouse@local.com", + "mouse@your.domain.here", "mouse@mouse.com", "password", local=True, @@ -29,10 +30,12 @@ class AuthenticationViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.settings = models.SiteSettings.objects.create(id=1) - def test_login_get(self): + self.settings = models.SiteSettings.objects.create( + id=1, require_confirm_email=False + ) + + def test_login_get(self, _): """there are so many views, this just makes sure it LOADS""" login = views.Login.as_view() request = self.factory.get("") @@ -48,7 +51,67 @@ class AuthenticationViews(TestCase): self.assertEqual(result.url, "/") self.assertEqual(result.status_code, 302) - def test_register(self): + def test_login_post_localname(self, _): + """there are so many views, this just makes sure it LOADS""" + view = views.Login.as_view() + form = forms.LoginForm() + form.data["localname"] = "mouse@mouse.com" + form.data["password"] = "password" + request = self.factory.post("", form.data) + request.user = self.anonymous_user + + with patch("bookwyrm.views.authentication.login"): + result = view(request) + self.assertEqual(result.url, "/") + self.assertEqual(result.status_code, 302) + + def test_login_post_username(self, _): + """there are so many views, this just makes sure it LOADS""" + view = views.Login.as_view() + form = forms.LoginForm() + form.data["localname"] = "mouse@your.domain.here" + form.data["password"] = "password" + request = self.factory.post("", form.data) + request.user = self.anonymous_user + + with patch("bookwyrm.views.authentication.login"): + result = view(request) + self.assertEqual(result.url, "/") + self.assertEqual(result.status_code, 302) + + def test_login_post_email(self, _): + """there are so many views, this just makes sure it LOADS""" + view = views.Login.as_view() + form = forms.LoginForm() + form.data["localname"] = "mouse" + form.data["password"] = "password" + request = self.factory.post("", form.data) + request.user = self.anonymous_user + + with patch("bookwyrm.views.authentication.login"): + result = view(request) + self.assertEqual(result.url, "/") + self.assertEqual(result.status_code, 302) + + def test_login_post_invalid_credentials(self, _): + """there are so many views, this just makes sure it LOADS""" + view = views.Login.as_view() + form = forms.LoginForm() + form.data["localname"] = "mouse" + form.data["password"] = "passsword1" + request = self.factory.post("", form.data) + request.user = self.anonymous_user + + with patch("bookwyrm.views.authentication.login"): + result = view(request) + result.render() + self.assertEqual(result.status_code, 200) + self.assertEqual( + result.context_data["login_form"].non_field_errors, + "Username or password are incorrect", + ) + + def test_register(self, _): """create a user""" view = views.Register.as_view() self.assertEqual(models.User.objects.count(), 1) @@ -60,9 +123,8 @@ class AuthenticationViews(TestCase): "email": "aa@bb.cccc", }, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.views.authentication.login"): - response = view(request) + 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() @@ -70,16 +132,42 @@ class AuthenticationViews(TestCase): self.assertEqual(nutria.localname, "nutria-user.user_nutria") self.assertEqual(nutria.local, True) - def test_register_trailing_space(self): + @patch("bookwyrm.emailing.send_email.delay") + def test_register_email_confirm(self, *_): + """create a user""" + self.settings.require_confirm_email = True + self.settings.save() + + view = views.Register.as_view() + self.assertEqual(models.User.objects.count(), 1) + request = self.factory.post( + "register/", + { + "localname": "nutria", + "password": "mouseword", + "email": "aa@bb.cccc", + }, + ) + with patch("bookwyrm.views.authentication.login"): + response = view(request) + self.assertEqual(response.status_code, 302) + nutria = models.User.objects.get(localname="nutria") + self.assertEqual(nutria.username, "nutria@%s" % DOMAIN) + self.assertEqual(nutria.local, True) + + self.assertFalse(nutria.is_active) + self.assertEqual(nutria.deactivation_reason, "pending") + self.assertIsNotNone(nutria.confirmation_code) + + def test_register_trailing_space(self, _): """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.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.views.authentication.login"): - response = view(request) + 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() @@ -87,7 +175,7 @@ class AuthenticationViews(TestCase): self.assertEqual(nutria.localname, "nutria") self.assertEqual(nutria.local, True) - def test_register_invalid_email(self): + def test_register_invalid_email(self, _): """gotta have an email""" view = views.Register.as_view() self.assertEqual(models.User.objects.count(), 1) @@ -98,7 +186,7 @@ class AuthenticationViews(TestCase): self.assertEqual(models.User.objects.count(), 1) response.render() - def test_register_invalid_username(self): + def test_register_invalid_username(self, _): """gotta have an email""" view = views.Register.as_view() self.assertEqual(models.User.objects.count(), 1) @@ -126,7 +214,7 @@ class AuthenticationViews(TestCase): self.assertEqual(models.User.objects.count(), 1) response.render() - def test_register_closed_instance(self): + def test_register_closed_instance(self, _): """you can't just register""" view = views.Register.as_view() self.settings.allow_registration = False @@ -138,7 +226,7 @@ class AuthenticationViews(TestCase): with self.assertRaises(PermissionDenied): view(request) - def test_register_invite(self): + def test_register_invite(self, _): """you can't just register""" view = views.Register.as_view() self.settings.allow_registration = False @@ -157,9 +245,8 @@ class AuthenticationViews(TestCase): "invite_code": "testcode", }, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) self.assertEqual(models.SiteInvite.objects.get().times_used, 1) @@ -191,3 +278,74 @@ class AuthenticationViews(TestCase): with self.assertRaises(Http404): response = view(request) self.assertEqual(models.User.objects.count(), 2) + + def test_confirm_email_code_get(self, _): + """there are so many views, this just makes sure it LOADS""" + self.settings.require_confirm_email = True + self.settings.save() + + self.local_user.is_active = False + self.local_user.deactivation_reason = "pending" + self.local_user.confirmation_code = "12345" + self.local_user.save( + broadcast=False, + update_fields=["is_active", "deactivation_reason", "confirmation_code"], + ) + view = views.ConfirmEmailCode.as_view() + request = self.factory.get("") + request.user = self.anonymous_user + + result = view(request, "12345") + self.assertEqual(result.url, "/login/confirmed") + self.assertEqual(result.status_code, 302) + + self.local_user.refresh_from_db() + self.assertTrue(self.local_user.is_active) + self.assertIsNone(self.local_user.deactivation_reason) + + request.user = self.local_user + result = view(request, "12345") + self.assertEqual(result.url, "/") + self.assertEqual(result.status_code, 302) + + def test_confirm_email_code_get_invalid_code(self, _): + """there are so many views, this just makes sure it LOADS""" + self.settings.require_confirm_email = True + self.settings.save() + + self.local_user.is_active = False + self.local_user.deactivation_reason = "pending" + self.local_user.confirmation_code = "12345" + self.local_user.save( + broadcast=False, + update_fields=["is_active", "deactivation_reason", "confirmation_code"], + ) + view = views.ConfirmEmailCode.as_view() + request = self.factory.get("") + request.user = self.anonymous_user + + result = view(request, "abcde") + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + self.assertFalse(self.local_user.is_active) + self.assertEqual(self.local_user.deactivation_reason, "pending") + + def test_confirm_email_get(self, _): + """there are so many views, this just makes sure it LOADS""" + self.settings.require_confirm_email = True + self.settings.save() + + login = views.ConfirmEmail.as_view() + request = self.factory.get("") + request.user = self.anonymous_user + + result = login(request) + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + + request.user = self.local_user + result = login(request) + self.assertEqual(result.url, "/") + self.assertEqual(result.status_code, 302) diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 06080bb25..6157b6516 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -17,7 +17,7 @@ class AuthorViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -34,15 +34,14 @@ class AuthorViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + 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_author_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py index d640617cd..11283869b 100644 --- a/bookwyrm/tests/views/test_block.py +++ b/bookwyrm/tests/views/test_block.py @@ -14,7 +14,7 @@ class BlockViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -22,18 +22,18 @@ class BlockViews(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", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + 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_block_get(self, _): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index 375cdb038..c5d86a12d 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -12,6 +12,7 @@ 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 django.utils import timezone from bookwyrm import forms, models, views from bookwyrm.activitypub import ActivitypubResponse @@ -23,7 +24,7 @@ class BookViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -40,19 +41,23 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + 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_book_page(self): """there are so many views, this just makes sure it LOADS""" view = views.Book.as_view() + models.ReadThrough.objects.create( + user=self.local_user, + book=self.book, + start_date=timezone.now(), + ) request = self.factory.get("") request.user = self.local_user with patch("bookwyrm.views.books.is_api_request") as is_api: @@ -68,14 +73,86 @@ class BookViews(TestCase): self.assertIsInstance(result, ActivitypubResponse) self.assertEqual(result.status_code, 200) + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") + @patch("bookwyrm.activitystreams.ActivityStream.add_status") + def test_book_page_statuses(self, *_): + """there are so many views, this just makes sure it LOADS""" + view = views.Book.as_view() + + review = models.Review.objects.create( + user=self.local_user, + book=self.book, + content="hi", + ) + + comment = models.Comment.objects.create( + user=self.local_user, + book=self.book, + content="hi", + ) + + quote = models.Quotation.objects.create( + user=self.local_user, + book=self.book, + content="hi", + quote="wow", + ) + + request = self.factory.get("") + request.user = self.local_user + with patch("bookwyrm.views.books.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.book.id, user_statuses="review") + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + self.assertEqual(result.context_data["statuses"].object_list[0], review) + + with patch("bookwyrm.views.books.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.book.id, user_statuses="comment") + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + self.assertEqual(result.context_data["statuses"].object_list[0], comment) + + with patch("bookwyrm.views.books.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.book.id, user_statuses="quotation") + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + self.assertEqual(result.context_data["statuses"].object_list[0], quote) + + def test_book_page_invalid_id(self): + """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 + with patch("bookwyrm.views.books.is_api_request") as is_api: + is_api.return_value = False + result = view(request, 0) + self.assertEqual(result.status_code, 404) + + def test_book_page_work_id(self): + """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 + with patch("bookwyrm.views.books.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.work.id) + result.render() + self.assertEqual(result.status_code, 200) + self.assertEqual(result.context_data["book"], self.book) + def test_edit_book_page(self): """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 request.user.is_superuser = True - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - result = view(request, self.book.id) + result = view(request, self.book.id) self.assertIsInstance(result, TemplateResponse) result.render() self.assertEqual(result.status_code, 200) @@ -90,9 +167,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - 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") @@ -108,9 +184,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - result = view(request, self.book.id) - result.render() + result = view(request, self.book.id) + result.render() # the changes haven't been saved yet self.book.refresh_from_db() @@ -128,9 +203,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - 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") @@ -150,9 +224,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - 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()) @@ -167,8 +240,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - view(request) + view(request) + book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work.title, "New Title") @@ -183,8 +256,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - view(request) + view(request) + book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work, self.work) @@ -200,21 +273,19 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_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") self.assertEqual(book.authors.first(), book.parent_work.authors.first()) - def test_switch_edition(self): + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + def test_switch_edition(self, _): """updates user's relationships to a book""" work = models.Work.objects.create(title="test work") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - edition1 = models.Edition.objects.create(title="first ed", parent_work=work) - edition2 = models.Edition.objects.create( - title="second ed", parent_work=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( @@ -267,12 +338,11 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_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) + 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) @@ -300,12 +370,24 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_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) + 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) + + def test_add_description(self): + """add a book description""" + self.local_user.groups.add(self.group) + request = self.factory.post("", {"description": "new description hi"}) + request.user = self.local_user + + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + views.add_description(request, self.book.id) + + self.book.refresh_from_db() + self.assertEqual(self.book.description, "new description hi") + self.assertEqual(self.book.last_edited_by, self.local_user) diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index 79dbd2a23..bdda81013 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -1,8 +1,10 @@ """ 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 from django.test.client import RequestFactory -from unittest.mock import patch from bookwyrm import models, views @@ -13,7 +15,7 @@ class DirectoryViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -22,19 +24,34 @@ class DirectoryViews(TestCase): 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, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() - def test_directory_page(self): + models.SiteSettings.objects.create() + self.anonymous_user = AnonymousUser + self.anonymous_user.is_authenticated = False + + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + @patch("bookwyrm.suggested_users.rerank_user_task.delay") + def test_directory_page(self, *_): + """there are so many views, this just makes sure it LOADS""" + 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, + ) + 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) + + def test_directory_page_empty(self): """there are so many views, this just makes sure it LOADS""" view = views.Directory.as_view() request = self.factory.get("") @@ -44,3 +61,12 @@ class DirectoryViews(TestCase): self.assertIsInstance(result, TemplateResponse) result.render() self.assertEqual(result.status_code, 200) + + def test_directory_page_logged_out(self): + """there are so many views, this just makes sure it LOADS""" + view = views.Directory.as_view() + request = self.factory.get("") + request.user = self.anonymous_user + + result = view(request) + self.assertEqual(result.status_code, 302) diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py index af39f0054..df89d5b09 100644 --- a/bookwyrm/tests/views/test_edit_user.py +++ b/bookwyrm/tests/views/test_edit_user.py @@ -15,13 +15,14 @@ from django.test.client import RequestFactory from bookwyrm import forms, models, views +@patch("bookwyrm.suggested_users.remove_user_task.delay") class EditUserViews(TestCase): """view user and edit profile""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -33,8 +34,9 @@ class EditUserViews(TestCase): "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test") + self.book = models.Edition.objects.create( + title="test", parent_work=models.Work.objects.create(title="test work") + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): models.ShelfBook.objects.create( book=self.book, @@ -42,12 +44,11 @@ class EditUserViews(TestCase): shelf=self.local_user.shelf_set.first(), ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - def test_edit_user_page(self): + 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("") @@ -57,32 +58,33 @@ class EditUserViews(TestCase): result.render() self.assertEqual(result.status_code, 200) - def test_edit_user(self): + 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["default_post_privacy"] = "public" 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.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + 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): + 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["default_post_privacy"] = "public" form.data["preferred_timezone"] = "UTC" image_file = pathlib.Path(__file__).parent.joinpath( "../../static/images/no_cover.jpg" @@ -93,19 +95,18 @@ class EditUserViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + 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): + def test_crop_avatar(self, _): """reduce that image size""" image_file = pathlib.Path(__file__).parent.joinpath( "../../static/images/no_cover.jpg" @@ -117,7 +118,7 @@ class EditUserViews(TestCase): image_result = Image.open(result) self.assertEqual(image_result.size, (120, 120)) - def test_delete_user_page(self): + 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("") @@ -127,7 +128,8 @@ class EditUserViews(TestCase): result.render() self.assertEqual(result.status_code, 200) - def test_delete_user(self): + @patch("bookwyrm.suggested_users.rerank_suggestions_task") + def test_delete_user(self, *_): """use a form to update a user""" view = views.DeleteUser.as_view() form = forms.DeleteUserForm() diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py index 9ff122552..f43a9623e 100644 --- a/bookwyrm/tests/views/test_federation.py +++ b/bookwyrm/tests/views/test_federation.py @@ -15,7 +15,7 @@ class FederationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -23,18 +23,18 @@ 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", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + 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): """there are so many views, this just makes sure it LOADS""" @@ -69,7 +69,7 @@ class FederationViews(TestCase): identifier="hi.there.com", ) self.remote_user.federated_server = server - self.remote_user.save() + self.remote_user.save(update_fields=["federated_server"]) self.assertEqual(server.status, "federated") @@ -108,7 +108,9 @@ 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() + self.remote_user.save( + update_fields=["federated_server", "is_active", "deactivation_reason"] + ) request = self.factory.post("") request.user = self.local_user @@ -163,7 +165,7 @@ class FederationViews(TestCase): """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() + self.remote_user.save(update_fields=["federated_server"]) data = [ {"instance": "server.name", "url": "https://explanation.url"}, # new server diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index 81087cd1e..666c3e02b 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -16,13 +16,15 @@ from bookwyrm.activitypub import ActivitypubResponse @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream") @patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") +@patch("bookwyrm.suggested_users.remove_user_task.delay") class FeedViews(TestCase): """activity feed, statuses, dms""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -30,21 +32,20 @@ class FeedViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + 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() + @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions") def test_feed(self, *_): """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 - result = view(request, "local") + result = view(request, "home") self.assertIsInstance(result, TemplateResponse) result.render() self.assertEqual(result.status_code, 200) @@ -92,14 +93,11 @@ class FeedViews(TestCase): output = BytesIO() image.save(output, format=image.format) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - status = models.Review.objects.create( - content="hi", - user=self.local_user, - book=self.book, - ) + 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" ) @@ -152,13 +150,12 @@ class FeedViews(TestCase): def test_get_suggested_book(self, *_): """gets books the ~*~ algorithm ~*~ thinks you want to post about""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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"), - ) + 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"), + ) suggestions = views.feed.get_suggested_books(self.local_user) 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 f37370cc6..714284b01 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -10,13 +10,13 @@ from django.test.client import RequestFactory from bookwyrm import models, views -class BookViews(TestCase): - """books books books""" +class FollowViews(TestCase): + """follows""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -25,16 +25,16 @@ class BookViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "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", - ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "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", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -43,13 +43,12 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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, + ) def test_handle_follow_remote(self): """send a follow request""" @@ -68,7 +67,7 @@ class BookViews(TestCase): def test_handle_follow_local_manually_approves(self): """send a follow request""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): rat = models.User.objects.create_user( "rat@local.com", "rat@rat.com", @@ -92,7 +91,7 @@ class BookViews(TestCase): def test_handle_follow_local(self): """send a follow request""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): rat = models.User.objects.create_user( "rat@local.com", "rat@rat.com", @@ -131,7 +130,9 @@ class BookViews(TestCase): def test_handle_accept(self): """accept a follow request""" self.local_user.manually_approves_followers = True - self.local_user.save(broadcast=False) + self.local_user.save( + broadcast=False, update_fields=["manually_approves_followers"] + ) request = self.factory.post("", {"user": self.remote_user.username}) request.user = self.local_user rel = models.UserFollowRequest.objects.create( @@ -148,7 +149,9 @@ 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) + self.local_user.save( + broadcast=False, update_fields=["manually_approves_followers"] + ) 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_get_started.py b/bookwyrm/tests/views/test_get_started.py index 7a3b0c444..eb9d67b5d 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -13,7 +13,7 @@ class GetStartedViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -21,17 +21,15 @@ class GetStartedViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) + 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.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_profile_view(self): """there are so many views, this just makes sure it LOADS""" @@ -45,7 +43,9 @@ class GetStartedViews(TestCase): result.render() self.assertEqual(result.status_code, 200) - def test_profile_view_post(self): + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + @patch("bookwyrm.suggested_users.rerank_user_task.delay") + def test_profile_view_post(self, *_): """save basic user details""" view = views.GetStartedProfile.as_view() form = forms.LimitedEditUserForm(instance=self.local_user) @@ -55,12 +55,11 @@ class GetStartedViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + 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) @@ -88,7 +87,8 @@ class GetStartedViews(TestCase): result.render() self.assertEqual(result.status_code, 200) - def test_books_view_post(self): + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + 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} @@ -106,7 +106,8 @@ class GetStartedViews(TestCase): self.assertEqual(shelfbook.book, self.book) self.assertEqual(shelfbook.user, self.local_user) - def test_users_view(self): + @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions") + 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("") @@ -118,7 +119,8 @@ class GetStartedViews(TestCase): result.render() self.assertEqual(result.status_code, 200) - def test_users_view_with_query(self): + @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions") + 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") diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index 013d15950..23bd8e1a8 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -16,7 +16,7 @@ class GoalViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -33,15 +33,14 @@ class GoalViews(TestCase): localname="rat", remote_id="https://example.com/users/rat", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.year = timezone.now().year + models.SiteSettings.objects.create() def test_goal_page_no_goal(self): """view a reading goal page for another's unset goal""" @@ -49,7 +48,7 @@ class GoalViews(TestCase): request = self.factory.get("") request.user = self.rat - result = view(request, self.local_user.localname, 2020) + result = view(request, self.local_user.localname, self.year) self.assertEqual(result.status_code, 404) def test_goal_page_no_goal_self(self): @@ -58,7 +57,7 @@ class GoalViews(TestCase): request = self.factory.get("") request.user = self.local_user - result = view(request, self.local_user.localname, 2020) + result = view(request, self.local_user.localname, self.year) result.render() self.assertIsInstance(result, TemplateResponse) @@ -68,7 +67,7 @@ class GoalViews(TestCase): request = self.factory.get("") request.user = self.anonymous_user - result = view(request, self.local_user.localname, 2020) + result = view(request, self.local_user.localname, self.year) self.assertEqual(result.status_code, 302) def test_goal_page_public(self): @@ -96,13 +95,13 @@ class GoalViews(TestCase): def test_goal_page_private(self): """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=self.year, goal=15, privacy="followers" ) 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, self.year) self.assertEqual(result.status_code, 404) @patch("bookwyrm.activitystreams.ActivityStream.add_status") @@ -114,19 +113,19 @@ class GoalViews(TestCase): { "user": self.local_user.id, "goal": 10, - "year": 2020, + "year": self.year, "privacy": "unlisted", "post-status": True, }, ) request.user = self.local_user with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.local_user.localname, 2020) + view(request, self.local_user.localname, self.year) 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.year, self.year) self.assertEqual(goal.privacy, "unlisted") status = models.GeneratedNote.objects.get() diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index e8d1895cf..b9a82e681 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -2,7 +2,6 @@ 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 @@ -13,23 +12,27 @@ from bookwyrm.settings import USER_AGENT @patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") +@patch("bookwyrm.suggested_users.rerank_user_task.delay") class ViewsHelpers(TestCase): """viewing and creating statuses""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - discoverable=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): + with patch("bookwyrm.suggested_users.rerank_user_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + discoverable=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + with patch("bookwyrm.suggested_users.rerank_user_task.delay"): self.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", @@ -40,13 +43,12 @@ class ViewsHelpers(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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, + ) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") self.userdata = json.loads(datafile.read_bytes()) del self.userdata["icon"] @@ -55,12 +57,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"), @@ -73,7 +75,7 @@ class ViewsHelpers(TestCase): with self.assertRaises(Http404): 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"} @@ -87,12 +89,12 @@ class ViewsHelpers(TestCase): request.headers = {"Accept": "Praise"} self.assertFalse(views.helpers.is_api_request(request)) - def test_is_api_request_no_headers(self, _): + 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, _): + 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)) @@ -107,7 +109,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) @@ -119,7 +121,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 = { @@ -144,13 +146,12 @@ class ViewsHelpers(TestCase): json=self.userdata, status=200, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - 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") + 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") - def test_user_on_blocked_server(self, _): + def test_user_on_blocked_server(self, *_): """find a remote user using webfinger""" models.FederatedServer.objects.create( server_name="example.com", status="blocked" @@ -159,7 +160,7 @@ class ViewsHelpers(TestCase): result = views.helpers.handle_remote_webfinger("@mouse@example.com") self.assertIsNone(result) - def test_handle_reading_status_to_read(self, _): + 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"): @@ -171,7 +172,7 @@ 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, _): + 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"): @@ -183,7 +184,7 @@ class ViewsHelpers(TestCase): self.assertEqual(status.mention_books.first(), self.book) self.assertEqual(status.content, "started reading") - def test_handle_reading_status_read(self, _): + 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"): @@ -195,106 +196,10 @@ class ViewsHelpers(TestCase): self.assertEqual(status.mention_books.first(), self.book) self.assertEqual(status.content, "finished reading") - def test_handle_reading_status_other(self, _): + def test_handle_reading_status_other(self, *_): """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.assertFalse(models.GeneratedNote.objects.exists()) - - def test_get_annotated_users(self, _): - """list of people you might know""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - 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.followers.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_annotated_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) - - def test_get_annotated_users_counts(self, _): - """correct counting for multiple shared attributed""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user_1 = models.User.objects.create_user( - "nutria@local.com", - "nutria@nutria.com", - "nutriaword", - local=True, - localname="nutria", - discoverable=True, - ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - 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.following.add(user_1) - user.followers.add(self.local_user) - - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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_annotated_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/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py index da8ade989..d9d67d568 100644 --- a/bookwyrm/tests/views/test_import.py +++ b/bookwyrm/tests/views/test_import.py @@ -1,11 +1,12 @@ """ test for app action functionality """ +import pathlib 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 -from bookwyrm import models -from bookwyrm import views +from bookwyrm import forms, models, views class ImportViews(TestCase): @@ -14,7 +15,7 @@ class ImportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -22,8 +23,7 @@ class ImportViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_import_page(self): """there are so many views, this just makes sure it LOADS""" @@ -48,6 +48,27 @@ class ImportViews(TestCase): result.render() self.assertEqual(result.status_code, 200) + def test_start_import(self): + """retry failed items""" + view = views.Import.as_view() + form = forms.ImportForm() + form.data["source"] = "LibraryThing" + form.data["privacy"] = "public" + form.data["include_reviews"] = False + csv_file = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") + form.data["csv_file"] = SimpleUploadedFile( + csv_file, open(csv_file, "rb").read(), content_type="text/csv" + ) + + request = self.factory.post("", form.data) + request.user = self.local_user + + with patch("bookwyrm.importers.Importer.start_import"): + view(request) + job = models.ImportJob.objects.get() + self.assertFalse(job.include_reviews) + self.assertEqual(job.privacy, "public") + def test_retry_import(self): """retry failed items""" view = views.ImportStatus.as_view() diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 1661676cb..d83fc1190 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -15,7 +15,7 @@ class InteractionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -24,25 +24,24 @@ class InteractionViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "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", - ) - - with patch("bookwyrm.preview_images.generate_edition_preview_image_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.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "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", ) + 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_favorite(self, *_): """create and broadcast faving a status""" view = views.Favorite.as_view() diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py index 0743c65e1..6ad464208 100644 --- a/bookwyrm/tests/views/test_invite.py +++ b/bookwyrm/tests/views/test_invite.py @@ -16,7 +16,7 @@ class InviteViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -24,8 +24,7 @@ class InviteViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_invite_page(self): """there are so many views, this just makes sure it LOADS""" @@ -53,6 +52,26 @@ class InviteViews(TestCase): result.render() self.assertEqual(result.status_code, 200) + def test_manage_invites_post(self): + """there are so many views, this just makes sure it LOADS""" + view = views.ManageInvites.as_view() + form = forms.CreateInviteForm() + form.data["use_limit"] = 3 + form.data["expiry"] = "" + request = self.factory.post("", form.data) + 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) + + invite = models.SiteInvite.objects.get() + self.assertEqual(invite.use_limit, 3) + self.assertIsNone(invite.expiry) + def test_invite_request(self): """request to join a server""" form = forms.InviteRequestForm() diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index f26a08e53..7c413e8bf 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -16,7 +16,7 @@ class IsbnViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -25,19 +25,17 @@ class IsbnViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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 ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_isbn_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py index 7def39585..4d1531e45 100644 --- a/bookwyrm/tests/views/test_landing.py +++ b/bookwyrm/tests/views/test_landing.py @@ -15,7 +15,7 @@ class LandingViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -25,10 +25,10 @@ class LandingViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() - def test_home_page(self): + @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions") + def test_home_page(self, _): """there are so many views, this just makes sure it LOADS""" view = views.Home.as_view() request = self.factory.get("") diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py index 3783b9b69..988d8d4ad 100644 --- a/bookwyrm/tests/views/test_list.py +++ b/bookwyrm/tests/views/test_list.py @@ -17,7 +17,7 @@ class ListViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -34,31 +34,30 @@ class ListViews(TestCase): localname="rat", remote_id="https://example.com/users/rat", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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( @@ -66,8 +65,8 @@ class ListViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_lists_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py index cbe00d27a..2339427c6 100644 --- a/bookwyrm/tests/views/test_list_actions.py +++ b/bookwyrm/tests/views/test_list_actions.py @@ -15,7 +15,7 @@ class ListActionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -33,31 +33,30 @@ class ListActionViews(TestCase): remote_id="https://example.com/users/rat", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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( @@ -65,8 +64,7 @@ class ListActionViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_curate_approve(self): """approve a pending item""" diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 1de196c56..af6aac13e 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -1,8 +1,8 @@ """ 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 unittest.mock import patch from bookwyrm import models from bookwyrm import views @@ -14,7 +14,7 @@ class NotificationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -22,8 +22,7 @@ class NotificationViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_notifications_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py index 8877a2441..fe493bb87 100644 --- a/bookwyrm/tests/views/test_outbox.py +++ b/bookwyrm/tests/views/test_outbox.py @@ -18,7 +18,7 @@ class OutboxView(TestCase): def setUp(self): """we'll need some data""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -27,13 +27,12 @@ class OutboxView(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_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, - ) + 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_outbox(self, _): """returns user's statuses""" @@ -81,16 +80,13 @@ class OutboxView(TestCase): def test_outbox_filter(self, _): """if we only care about reviews, only get reviews""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - models.Review.objects.create( - content="look at this", - name="hi", - rating=1, - book=self.book, - user=self.local_user, - ) + 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) request = self.factory.get("", {"type": "bleh"}) @@ -110,16 +106,13 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_true(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + 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") @@ -131,16 +124,13 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_false(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + 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") diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py index 982056b5a..5f59e9e32 100644 --- a/bookwyrm/tests/views/test_password.py +++ b/bookwyrm/tests/views/test_password.py @@ -15,7 +15,7 @@ class PasswordViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -25,8 +25,7 @@ class PasswordViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create(id=1) + models.SiteSettings.objects.create(id=1) def test_password_reset_request(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index ec0d1339b..bebd9f5a9 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -9,13 +9,14 @@ from bookwyrm import models, views @patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class ReadingViews(TestCase): """viewing and creating statuses""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -24,25 +25,24 @@ class ReadingViews(TestCase): localname="mouse", remote_id="https://example.com/users/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", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, + 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.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, + ) - def test_start_reading(self, _): + def test_start_reading(self, *_): """begin a book""" shelf = self.local_user.shelf_set.get(identifier=models.Shelf.READING) self.assertFalse(shelf.books.exists()) @@ -73,7 +73,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=models.Shelf.TO_READ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -93,7 +93,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=models.Shelf.READ_FINISHED) self.assertFalse(shelf.books.exists()) @@ -129,7 +129,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( @@ -156,7 +156,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 @@ -173,7 +173,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_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index ed4795700..618d9cf87 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -7,6 +7,7 @@ from django.utils import timezone from bookwyrm import models +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") class ReadThrough(TestCase): """readthrough tests""" @@ -15,14 +16,13 @@ class ReadThrough(TestCase): """basic user and book data""" self.client = Client() - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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 - ) + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.user = models.User.objects.create_user( "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" ) @@ -30,7 +30,7 @@ class ReadThrough(TestCase): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.client.force_login(self.user) - def test_create_basic_readthrough(self, delay_mock): + 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) @@ -51,7 +51,7 @@ class ReadThrough(TestCase): self.assertEqual(readthroughs[0].finish_date, None) self.assertEqual(delay_mock.call_count, 1) - def test_create_progress_readthrough(self, delay_mock): + def test_create_progress_readthrough(self, delay_mock, _): """a readthrough with progress""" self.assertEqual(self.edition.readthrough_set.count(), 0) diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py index 7944d8b45..7d39a0076 100644 --- a/bookwyrm/tests/views/test_reports.py +++ b/bookwyrm/tests/views/test_reports.py @@ -1,8 +1,8 @@ """ 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 unittest.mock import patch from bookwyrm import forms, models, views @@ -13,7 +13,7 @@ class ReportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -28,8 +28,7 @@ class ReportViews(TestCase): local=True, localname="rat", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_reports_page(self): """there are so many views, this just makes sure it LOADS""" @@ -117,7 +116,9 @@ class ReportViews(TestCase): report.refresh_from_db() self.assertFalse(report.resolved) - def test_suspend_user(self): + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + @patch("bookwyrm.suggested_users.remove_user_task.delay") + def test_suspend_user(self, *_): """toggle whether a user is able to log in""" self.assertTrue(self.rat.is_active) request = self.factory.post("") diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 57961a316..3608b043a 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -12,45 +12,40 @@ class RssFeedView(TestCase): def setUp(self): """test data""" - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.site = models.SiteSettings.objects.create() + self.site = models.SiteSettings.objects.create() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.user = models.User.objects.create_user( "rss_user", "rss@test.rss", "password", local=True ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_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, - ) + 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"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_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.models.activitypub_mixin.broadcast_task.delay"): + 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() diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 56413de63..3da6f866b 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -19,7 +19,7 @@ class Views(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -28,18 +28,16 @@ class Views(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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, + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_search_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py index 21a305444..44c4b9cb5 100644 --- a/bookwyrm/tests/views/test_shelf.py +++ b/bookwyrm/tests/views/test_shelf.py @@ -10,13 +10,14 @@ from bookwyrm.activitypub import ActivitypubResponse @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") class ShelfViews(TestCase): """tag views""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -25,21 +26,19 @@ class ShelfViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - 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, - ) + 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, + ) 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 ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() - def test_shelf_page(self, _): + def test_shelf_page(self, *_): """there are so many views, this just makes sure it LOADS""" view = views.Shelf.as_view() shelf = self.local_user.shelf_set.first() @@ -66,7 +65,7 @@ class ShelfViews(TestCase): self.assertIsInstance(result, ActivitypubResponse) self.assertEqual(result.status_code, 200) - def test_edit_shelf_privacy(self, _): + def test_edit_shelf_privacy(self, *_): """set name or privacy on shelf""" view = views.Shelf.as_view() shelf = self.local_user.shelf_set.get(identifier="to-read") @@ -86,7 +85,7 @@ class ShelfViews(TestCase): self.assertEqual(shelf.privacy, "unlisted") - def test_edit_shelf_name(self, _): + def test_edit_shelf_name(self, *_): """change the name of an editable shelf""" view = views.Shelf.as_view() shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user) @@ -103,7 +102,7 @@ class ShelfViews(TestCase): self.assertEqual(shelf.name, "cool name") self.assertEqual(shelf.identifier, "testshelf-%d" % shelf.id) - def test_edit_shelf_name_not_editable(self, _): + def test_edit_shelf_name_not_editable(self, *_): """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") @@ -118,7 +117,7 @@ class ShelfViews(TestCase): self.assertEqual(shelf.name, "To Read") - def test_handle_shelve(self, _): + def test_handle_shelve(self, *_): """shelve a book""" request = self.factory.post( "", {"book": self.book.id, "shelf": self.shelf.identifier} @@ -136,7 +135,7 @@ class ShelfViews(TestCase): # make sure the book is on the shelf self.assertEqual(self.shelf.books.get(), self.book) - def test_handle_shelve_to_read(self, _): + 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( @@ -149,7 +148,7 @@ class ShelfViews(TestCase): # make sure the book is on the shelf self.assertEqual(shelf.books.get(), self.book) - def test_handle_shelve_reading(self, _): + def test_handle_shelve_reading(self, *_): """special behavior for the reading shelf""" shelf = models.Shelf.objects.get(identifier="reading") request = self.factory.post( @@ -162,7 +161,7 @@ class ShelfViews(TestCase): # make sure the book is on the shelf self.assertEqual(shelf.books.get(), self.book) - def test_handle_shelve_read(self, _): + def test_handle_shelve_read(self, *_): """special behavior for the read shelf""" shelf = models.Shelf.objects.get(identifier="read") request = self.factory.post( @@ -175,7 +174,7 @@ class ShelfViews(TestCase): # make sure the book is on the shelf self.assertEqual(shelf.books.get(), self.book) - def test_handle_unshelve(self, _): + def test_handle_unshelve(self, *_): """remove a book from a shelf""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): models.ShelfBook.objects.create( diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 68ddcd289..d4edee0b3 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -9,6 +9,7 @@ from bookwyrm.settings import DOMAIN # pylint: disable=invalid-name +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") class StatusViews(TestCase): """viewing and creating statuses""" @@ -16,7 +17,7 @@ class StatusViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -25,28 +26,26 @@ class StatusViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "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", - ) - - with patch("bookwyrm.preview_images.generate_edition_preview_image_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.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "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", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() - def test_handle_status(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=work, + ) + models.SiteSettings.objects.create() + + def test_handle_status(self, *_): """create a status""" view = views.CreateStatus.as_view() form = forms.CommentForm( @@ -69,13 +68,12 @@ class StatusViews(TestCase): 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() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True - ) + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True + ) with patch("bookwyrm.activitystreams.ActivityStream.add_status"): parent = models.Status.objects.create( content="parent status", user=self.local_user @@ -100,17 +98,16 @@ class StatusViews(TestCase): 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() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "rat@%s" % DOMAIN, - "rat@rat.com", - "password", - local=True, - localname="rat", - ) + user = models.User.objects.create_user( + "rat@%s" % DOMAIN, + "rat@rat.com", + "password", + local=True, + localname="rat", + ) form = forms.CommentForm( { "content": "hi @rat", @@ -133,13 +130,12 @@ class StatusViews(TestCase): status.content, '

hi @rat

' % 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() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True, localname="rat" - ) + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True, localname="rat" + ) form = forms.CommentForm( { "content": "hi @rat@example.com", @@ -178,7 +174,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_delete_and_redraft(self, _): + def test_delete_and_redraft(self, *_): """delete and re-draft a status""" view = views.DeleteAndRedraft.as_view() request = self.factory.post("") @@ -199,16 +195,15 @@ class StatusViews(TestCase): status.refresh_from_db() self.assertTrue(status.deleted) - def test_delete_and_redraft_invalid_status_type_rating(self, _): + 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.preview_images.generate_edition_preview_image_task.delay"): - 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.add_status"): + status = models.ReviewRating.objects.create( + book=self.book, rating=2.0, user=self.local_user + ) with patch( "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" @@ -220,7 +215,7 @@ class StatusViews(TestCase): status.refresh_from_db() self.assertFalse(status.deleted) - def test_delete_and_redraft_invalid_status_type_generated_note(self, _): + 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("") @@ -240,16 +235,15 @@ class StatusViews(TestCase): status.refresh_from_db() self.assertFalse(status.deleted) - def test_find_mentions(self, _): + def test_find_mentions(self, *_): """detect and look up @ mentions of users""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "nutria@%s" % DOMAIN, - "nutria@nutria.com", - "password", - local=True, - localname="nutria", - ) + user = models.User.objects.create_user( + "nutria@%s" % DOMAIN, + "nutria@nutria.com", + "password", + local=True, + localname="nutria", + ) self.assertEqual(user.username, "nutria@%s" % DOMAIN) self.assertEqual( @@ -287,7 +281,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( @@ -310,7 +304,7 @@ class StatusViews(TestCase): "?q=arkady+strugatsky&mode=everything" % 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 rad" result = views.status.to_markdown(text) @@ -319,7 +313,7 @@ class StatusViews(TestCase): '

hi and fish.com ' "is rad

", ) - def test_to_markdown_detect_url(self, _): + def test_to_markdown_detect_url(self, *_): """this is mostly handled in other places, but nonetheless""" text = "http://fish.com/@hello#okay" result = views.status.to_markdown(text) @@ -328,13 +322,13 @@ class StatusViews(TestCase): '

fish.com/@hello#okay

', ) - 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 rad" result = views.status.to_markdown(text) self.assertEqual(result, '

hi ' "is rad

") - def test_handle_delete_status(self, mock): + def test_handle_delete_status(self, mock, *_): """marks a status as deleted""" view = views.DeleteStatus.as_view() with patch("bookwyrm.activitystreams.ActivityStream.add_status"): @@ -354,7 +348,7 @@ class StatusViews(TestCase): 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.activitystreams.ActivityStream.add_status"): @@ -368,7 +362,7 @@ class StatusViews(TestCase): status.refresh_from_db() self.assertFalse(status.deleted) - def test_handle_delete_status_moderator(self, mock): + def test_handle_delete_status_moderator(self, mock, _): """marks a status as deleted""" view = views.DeleteStatus.as_view() with patch("bookwyrm.activitystreams.ActivityStream.add_status"): diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index 07800e2f7..627b756e7 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -14,8 +14,8 @@ class UpdateViews(TestCase): def setUp(self): """we need basic test data and mocks""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.factory = RequestFactory() + self.factory = RequestFactory() + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -23,8 +23,7 @@ class UpdateViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_get_notification_count(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 3e7a5108d..740f0d299 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -16,8 +16,8 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.factory = RequestFactory() + self.factory = RequestFactory() + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -28,17 +28,18 @@ class UserViews(TestCase): self.rat = models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test") + self.book = models.Edition.objects.create( + title="test", parent_work=models.Work.objects.create(title="test work") + ) 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(), - ) + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): + models.ShelfBook.objects.create( + book=self.book, + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False @@ -97,7 +98,8 @@ class UserViews(TestCase): self.assertIsInstance(result, ActivitypubResponse) self.assertEqual(result.status_code, 200) - def test_followers_page_blocked(self): + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + def test_followers_page_blocked(self, _): """there are so many views, this just makes sure it LOADS""" view = views.Followers.as_view() request = self.factory.get("") diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py index ac750be00..86309045d 100644 --- a/bookwyrm/tests/views/test_user_admin.py +++ b/bookwyrm/tests/views/test_user_admin.py @@ -14,7 +14,7 @@ class UserAdminViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -22,8 +22,7 @@ class UserAdminViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_user_admin_list_page(self): """there are so many views, this just makes sure it LOADS""" @@ -49,7 +48,9 @@ class UserAdminViews(TestCase): result.render() self.assertEqual(result.status_code, 200) - def test_user_admin_page_post(self): + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + @patch("bookwyrm.suggested_users.remove_user_task.delay") + def test_user_admin_page_post(self, *_): """set the user's group""" group = Group.objects.create(name="editor") self.assertEqual( diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index 839240ed6..4a3eb579f 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -15,8 +15,8 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.factory = RequestFactory() + self.factory = RequestFactory() + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -27,18 +27,17 @@ class UserViews(TestCase): 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", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + 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 diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 7eccfd651..eb8491a94 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -23,6 +23,8 @@ STATUS_PATH = r"%s/(%s)/(?P\d+)" % (USER_PATH, "|".join(status_types) BOOK_PATH = r"^book/(?P\d+)" +STREAMS = "|".join(s["key"] for s in settings.STREAMS) + urlpatterns = [ path("admin/", admin.site.urls), path( @@ -44,7 +46,15 @@ urlpatterns = [ re_path("^api/updates/stream/(?P[a-z]+)/?$", views.get_unread_status_count), # authentication re_path(r"^login/?$", views.Login.as_view(), name="login"), + re_path(r"^login/(?Pconfirmed)?$", views.Login.as_view(), name="login"), re_path(r"^register/?$", views.Register.as_view()), + re_path(r"confirm-email/?$", views.ConfirmEmail.as_view(), name="confirm-email"), + re_path( + r"confirm-email/(?P[A-Za-z0-9]+)/?$", + views.ConfirmEmailCode.as_view(), + name="confirm-email-code", + ), + re_path(r"resend-link", views.resend_link, name="resend-link"), re_path(r"^logout/?$", views.Logout.as_view(), name="logout"), re_path( r"^password-reset/?$", @@ -177,7 +187,7 @@ urlpatterns = [ name="get-started-users", ), # feeds - re_path(r"^(?Phome|local|federated)/?$", views.Feed.as_view()), + re_path(r"^(?P{:s})/?$".format(STREAMS), views.Feed.as_view()), re_path( r"^direct-messages/?$", views.DirectMessage.as_view(), name="direct-messages" ), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 41bb64e54..eccb7f5e5 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -1,6 +1,7 @@ """ make sure all our nice views are available """ from .announcements import Announcements, Announcement, delete_announcement from .authentication import Login, Register, Logout +from .authentication import ConfirmEmail, ConfirmEmailCode, resend_link from .author import Author, EditAuthor from .block import Block, unblock from .books import Book, EditBook, ConfirmEditBook, Editions diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py index e522fc7f6..05386b7b1 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.all(), PAGE_LENGTH + models.Announcement.objects.order_by("-created_date"), PAGE_LENGTH ).get_page(request.GET.get("page")), "form": form, } diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py index bfb492480..70f51864d 100644 --- a/bookwyrm/views/authentication.py +++ b/bookwyrm/views/authentication.py @@ -6,24 +6,27 @@ 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.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt +from django.views.decorators.http import require_POST from django.views import View -from bookwyrm import forms, models +from bookwyrm import emailing, forms, models from bookwyrm.settings import DOMAIN -# pylint: disable= no-self-use +# pylint: disable=no-self-use @method_decorator(csrf_exempt, name="dispatch") class Login(View): """authenticate an existing user""" - def get(self, request): + def get(self, request, confirmed=None): """login page""" if request.user.is_authenticated: return redirect("/") - # sene user to the login page + # send user to the login page data = { + "show_confirmed_email": confirmed, "login_form": forms.LoginForm(), "register_form": forms.RegisterForm(), } @@ -37,35 +40,55 @@ class Login(View): 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) + username = models.User.objects.get(email=localname).username except models.User.DoesNotExist: # maybe it's a full username? username = localname else: username = "%s@%s" % (localname, DOMAIN) password = login_form.data["password"] + + # perform authentication 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) + user.save(broadcast=False, update_fields=["last_active_date"]) + if request.POST.get("first_login"): + return redirect("get-started-profile") return redirect(request.GET.get("next", "/")) + # maybe the user is pending email confirmation + if models.User.objects.filter( + username=username, is_active=False, deactivation_reason="pending" + ).exists(): + return redirect("confirm-email") + # 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) +@method_decorator(login_required, name="dispatch") +class Logout(View): + """log out""" + + def get(self, request): + """done with this place! outa here!""" + logout(request) + return redirect("/") + + class Register(View): """register a user""" def post(self, request): """join the server""" - if not models.SiteSettings.get().allow_registration: + settings = models.SiteSettings.get() + if not settings.allow_registration: invite_code = request.POST.get("invite_code") if not invite_code: @@ -104,22 +127,76 @@ class Register(View): 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, + deactivation_reason="pending" if settings.require_confirm_email else None, + is_active=not settings.require_confirm_email, ) if invite: invite.times_used += 1 invite.invitees.add(user) invite.save() + if settings.require_confirm_email: + emailing.email_confirmation_email(user) + return redirect("confirm-email") + login(request, user) return redirect("get-started-profile") -@method_decorator(login_required, name="dispatch") -class Logout(View): - """log out""" +class ConfirmEmailCode(View): + """confirm email address""" - def get(self, request): - """done with this place! outa here!""" - logout(request) - return redirect("/") + def get(self, request, code): # pylint: disable=unused-argument + """you got the code! good work""" + settings = models.SiteSettings.get() + if request.user.is_authenticated or not settings.require_confirm_email: + return redirect("/") + + # look up the user associated with this code + try: + user = models.User.objects.get(confirmation_code=code) + except models.User.DoesNotExist: + return TemplateResponse( + request, "confirm_email/confirm_email.html", {"valid": False} + ) + # update the user + user.is_active = True + user.deactivation_reason = None + user.save(broadcast=False, update_fields=["is_active", "deactivation_reason"]) + # direct the user to log in + return redirect("login", confirmed="confirmed") + + +class ConfirmEmail(View): + """enter code to confirm email address""" + + def get(self, request): # pylint: disable=unused-argument + """you need a code! keep looking""" + settings = models.SiteSettings.get() + if request.user.is_authenticated or not settings.require_confirm_email: + return redirect("/") + + return TemplateResponse( + request, "confirm_email/confirm_email.html", {"valid": True} + ) + + def post(self, request): + """same as clicking the link""" + code = request.POST.get("code") + return ConfirmEmailCode().get(request, code) + + +@require_POST +def resend_link(request): + """resend confirmation link""" + email = request.POST.get("email") + user = get_object_or_404(models.User, email=email) + emailing.email_confirmation_email(user) + return TemplateResponse( + request, "confirm_email/confirm_email.html", {"valid": True} + ) diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py index 492d0cac4..6cd0427c1 100644 --- a/bookwyrm/views/books.py +++ b/bookwyrm/views/books.py @@ -65,6 +65,13 @@ class Book(View): queryset = queryset.select_related("user") paginated = Paginator(queryset, PAGE_LENGTH) + lists = privacy_filter( + request.user, + models.List.objects.filter( + listitem__approved=True, + listitem__book__in=book.parent_work.editions.all(), + ), + ) data = { "book": book, "statuses": paginated.get_page(request.GET.get("page")), @@ -75,9 +82,7 @@ class Book(View): 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) - ), + "lists": lists, } if request.user.is_authenticated: @@ -339,18 +344,15 @@ def set_cover_from_url(url): @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("/") - book = get_object_or_404(models.Edition, id=book_id) description = request.POST.get("description") book.description = description book.last_edited_by = request.user - book.save() + book.save(update_fields=["description", "last_edited_by"]) - return redirect("/book/%s" % book.id) + return redirect("book", book.id) @require_POST @@ -360,7 +362,7 @@ def resolve_book(request): 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", book.id) @login_required diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py index a5786f740..8d893047a 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_annotated_users +from bookwyrm import suggested_users # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @@ -23,17 +23,21 @@ class Directory(View): if scope == "local": filters["local"] = True - users = get_annotated_users(request.user, **filters) + users = suggested_users.get_annotated_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", "-shared_books", "-last_active_date") + users = users.order_by("-mutuals", "-last_active_date") paginated = Paginator(users, 12) + page = paginated.get_page(request.GET.get("page")) data = { - "users": paginated.get_page(request.GET.get("page")), + "page_range": paginated.get_elided_page_range( + page.number, on_each_side=2, on_ends=1 + ), + "users": page, } return TemplateResponse(request, "directory/directory.html", data) diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 9a85dbb16..7a46ca57d 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -11,7 +11,8 @@ 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, get_suggested_users +from bookwyrm.suggested_users import suggested_users +from .helpers import get_user_from_username, privacy_filter from .helpers import is_api_request, is_bookwyrm_request @@ -22,23 +23,26 @@ class Feed(View): def get(self, request, tab): """user's homepage with activity feed""" - if not tab in STREAMS: - tab = "home" + tab = [s for s in STREAMS if s["key"] == tab] + tab = tab[0] if tab else STREAMS[0] - activities = activitystreams.streams[tab].get_activity_stream(request.user) + activities = activitystreams.streams[tab["key"]].get_activity_stream( + request.user + ) paginated = Paginator(activities, PAGE_LENGTH) - suggested_users = get_suggested_users(request.user) + suggestions = suggested_users.get_suggestions(request.user) data = { **feed_page_data(request.user), **{ "user": request.user, "activities": paginated.get_page(request.GET.get("page")), - "suggested_users": suggested_users, + "suggested_users": suggestions, "tab": tab, + "streams": STREAMS, "goal_form": forms.GoalForm(), - "path": "/%s" % tab, + "path": "/%s" % tab["key"], }, } return TemplateResponse(request, "feed/feed.html", data) diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py index 7f6151728..3de88e104 100644 --- a/bookwyrm/views/get_started.py +++ b/bookwyrm/views/get_started.py @@ -13,7 +13,7 @@ from django.views import View from bookwyrm import forms, models from bookwyrm.connectors import connector_manager -from .helpers import get_suggested_users +from bookwyrm.suggested_users import suggested_users from .edit_user import save_user_form @@ -118,11 +118,12 @@ class GetStartedUsers(View): ) .order_by("-similarity")[:5] ) + data = {"no_results": not user_results} if user_results.count() < 5: - user_results = list(user_results) + list(get_suggested_users(request.user)) + user_results = list(user_results) + suggested_users.get_suggestions( + request.user + ) - data = { - "suggested_users": user_results, - } + data["suggested_users"] = user_results return TemplateResponse(request, "get_started/users.html", data) diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py index 84091fe35..122245179 100644 --- a/bookwyrm/views/goal.py +++ b/bookwyrm/views/goal.py @@ -4,6 +4,7 @@ from django.http import HttpResponseNotFound from django.shortcuts import redirect from django.template.loader import get_template from django.template.response import TemplateResponse +from django.utils import timezone from django.utils.decorators import method_decorator from django.views import View from django.views.decorators.http import require_POST @@ -26,6 +27,10 @@ class Goal(View): if not goal and user != request.user: return HttpResponseNotFound() + current_year = timezone.now().year + if not goal and year != timezone.now().year: + return redirect("user-goal", username, current_year) + if goal and not goal.visible_to_user(request.user): return HttpResponseNotFound() diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 452d81b9c..42aa48f0e 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 Count, Max, Q +from django.db.models import Max, Q from django.http import Http404 from bookwyrm import activitypub, models @@ -177,47 +177,3 @@ def get_discover_books(): .order_by("-review__published_date__max")[:6] ) ) - - -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) - .exclude(Q(id__in=user.blocks.all()) | Q(blocks=user)) - .annotate( - mutuals=Count( - "followers", - filter=Q( - ~Q(id=user.id), - ~Q(id__in=user.following.all()), - followers__in=user.following.all(), - ), - distinct=True, - ), - 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() - ], - ), - distinct=True, - ), - ) - ) diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py index 91a379f31..18fcb02cd 100644 --- a/bookwyrm/views/password.py +++ b/bookwyrm/views/password.py @@ -76,7 +76,7 @@ class PasswordReset(View): return TemplateResponse(request, "password_reset.html", data) user.set_password(new_password) - user.save(broadcast=False) + user.save(broadcast=False, update_fields=["password"]) login(request, user) reset_code.delete() return redirect("/") @@ -100,6 +100,6 @@ class ChangePassword(View): return redirect("preferences/password") request.user.set_password(new_password) - request.user.save(broadcast=False) + request.user.save(broadcast=False, update_fields=["password"]) login(request, request.user) return redirect(request.user.local_path) diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index d15fc6a87..cdea86631 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -53,7 +53,7 @@ class Search(View): "remote": search_remote, } if query: - results = endpoints[search_type]( + results, search_remote = endpoints[search_type]( query, request.user, min_confidence, search_remote ) if results: @@ -61,25 +61,28 @@ class Search(View): request.GET.get("page") ) data["results"] = paginated + data["remote"] = search_remote return TemplateResponse(request, "search/{:s}.html".format(search_type), data) def book_search(query, _, min_confidence, search_remote=False): """the real business is elsewhere""" - 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}] + # try a local-only search + if not search_remote: + results = connector_manager.local_search(query, min_confidence=min_confidence) + if results: + # gret, we found something + return [{"results": results}], False + # if there weere no local results, or the request was for remote, search all sources + return connector_manager.search(query, min_confidence=min_confidence), True def user_search(query, viewer, *_): """cool kids members only user search""" # logged out viewers can't search users if not viewer.is_authenticated: - return models.User.objects.none() + return models.User.objects.none(), 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) @@ -98,7 +101,7 @@ def user_search(query, viewer, *_): similarity__gt=0.5, ) .order_by("-similarity")[:10] - ) + ), None def list_search(query, viewer, *_): @@ -119,4 +122,4 @@ def list_search(query, viewer, *_): similarity__gt=0.1, ) .order_by("-similarity")[:10] - ) + ), None diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 540975094..e9ad074d1 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 OuterRef, Subquery +from django.db.models import OuterRef, Subquery, F from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.http import HttpResponseBadRequest, HttpResponseNotFound @@ -69,7 +69,8 @@ class Shelf(View): reviews = privacy_filter(request.user, reviews) books = books.annotate( - rating=Subquery(reviews.values("rating")[:1]) + rating=Subquery(reviews.values("rating")[:1]), + shelved_date=F("shelfbook__shelved_date"), ).prefetch_related("authors") paginated = Paginator( diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py index 46bdf7226..42e8a6dd5 100644 --- a/bookwyrm/views/site.py +++ b/bookwyrm/views/site.py @@ -46,4 +46,6 @@ def email_preview(request): data["text_content_path"] = "email/{}/text_content.html".format(template) data["reset_link"] = "https://example.com/link" data["invite_link"] = "https://example.com/link" + data["confirmation_link"] = "https://example.com/link" + data["confirmation_code"] = "AKJHKDGKJSDFG" return TemplateResponse(request, "email/preview.html", data) diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index f62913a93..87e42b4e9 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -88,7 +88,9 @@ class Followers(View): if is_api_request(request): return ActivitypubResponse(user.to_followers_activity(**request.GET)) - paginated = Paginator(user.followers.all(), PAGE_LENGTH) + paginated = Paginator( + user.followers.order_by("-created_date").all(), PAGE_LENGTH + ) data = { "user": user, "is_self": request.user.id == user.id, @@ -107,7 +109,9 @@ class Following(View): if is_api_request(request): return ActivitypubResponse(user.to_following_activity(**request.GET)) - paginated = Paginator(user.following.all(), PAGE_LENGTH) + paginated = Paginator( + user.following.order_by("-created_date").all(), PAGE_LENGTH + ) data = { "user": user, "is_self": request.user.id == user.id, diff --git a/bw-dev b/bw-dev index d6ae9f433..ec888e166 100755 --- a/bw-dev +++ b/bw-dev @@ -31,6 +31,17 @@ function initdb { execweb python manage.py initdb } +function awscommand { + # expose env vars + export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} + export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} + export AWS_DEFAULT_REGION=${AWS_S3_REGION_NAME} + # first arg is mountpoint, second is the whole aws command + docker run --rm -it -v $1\ + -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_DEFAULT_REGION\ + amazon/aws-cli $2 +} + CMD=$1 if [ -n "$CMD" ]; then shift @@ -80,9 +91,25 @@ case "$CMD" in populate_streams) runweb python manage.py populate_streams ;; + populate_suggestions) + runweb python manage.py populate_suggestions + ;; generate_preview_images) runweb python manage.py generate_preview_images $@ ;; + copy_media_to_s3) + awscommand "bookwyrm_media_volume:/images"\ + "s3 cp /images s3://${AWS_STORAGE_BUCKET_NAME}/images\ + --endpoint-url ${AWS_S3_ENDPOINT_URL}\ + --recursive --acl public-read" + ;; + set_cors_to_s3) + awscommand "$(pwd):/bw"\ + "s3api put-bucket-cors\ + --bucket ${AWS_STORAGE_BUCKET_NAME}\ + --endpoint-url ${AWS_S3_ENDPOINT_URL}\ + --cors-configuration file:///bw/$@" + ;; runweb) runweb "$@" ;; @@ -91,6 +118,25 @@ case "$CMD" in ;; *) set +x # No need to echo echo - echo "Unrecognised command. Try: build, up, initdb, migrate, bash, shell, dbshell, restart_celery, update, populate_streams, generate_preview_images" + echo "Unrecognised command. Try:" + echo " up [container]" + echo " run" + echo " initdb" + echo " makemigrations [migration]" + echo " migrate [migration]" + echo " bash" + echo " shell" + echo " dbshell" + echo " restart_celery" + echo " collectstatic" + echo " build" + echo " clean" + echo " populate_streams" + echo " populate_suggestions" + echo " generate_preview_images [--all]" + echo " copy_media_to_s3" + echo " set_cors_to_s3 [cors file]" + echo " runweb [command]" + echo " rundb [command]" ;; esac diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py index 1dad55888..3ab338621 100644 --- a/celerywyrm/celery.py +++ b/celerywyrm/celery.py @@ -26,4 +26,5 @@ app.autodiscover_tasks(["bookwyrm"], related_name="emailing") app.autodiscover_tasks(["bookwyrm"], related_name="goodreads_import") app.autodiscover_tasks(["bookwyrm"], related_name="preview_images") app.autodiscover_tasks(["bookwyrm"], related_name="models.user") +app.autodiscover_tasks(["bookwyrm"], related_name="suggested_users") app.autodiscover_tasks(["bookwyrm"], related_name="views.inbox") diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index dde00be62..543d53559 100644 Binary files a/locale/de_DE/LC_MESSAGES/django.mo and b/locale/de_DE/LC_MESSAGES/django.mo differ diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 3125d147c..4906082a5 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-06 20:52+0000\n" +"POT-Creation-Date: 2021-08-07 01:35+0000\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,109 +18,135 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:224 +#: bookwyrm/forms.py:232 #, 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:238 +#: bookwyrm/forms.py:246 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:239 +#: bookwyrm/forms.py:247 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:240 +#: bookwyrm/forms.py:248 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:241 +#: bookwyrm/forms.py:249 msgid "Does Not Expire" msgstr "Läuft nicht aus" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:254 #, python-format msgid "%(count)d uses" msgstr "%(count)d Benutzungen" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:257 #, fuzzy #| msgid "Unlisted" msgid "Unlimited" msgstr "Ungelistet" -#: bookwyrm/forms.py:299 +#: bookwyrm/forms.py:307 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:300 +#: bookwyrm/forms.py:308 #, fuzzy #| msgid "Title" msgid "Book Title" msgstr "Titel" -#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 +#: bookwyrm/forms.py:309 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 "" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:315 #, fuzzy #| msgid "Started reading" msgid "Ascending" msgstr "Zu lesen angefangen" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:316 #, fuzzy #| msgid "Started reading" msgid "Descending" msgstr "Zu lesen angefangen" -#: bookwyrm/models/fields.py:25 +#: bookwyrm/models/fields.py:27 #, 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:43 +#: bookwyrm/models/fields.py:36 bookwyrm/models/fields.py:45 #, python-format msgid "%(value)s is not a valid username" msgstr "%(value)s ist kein gültiger Username" -#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 +#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159 msgid "username" msgstr "Username" -#: bookwyrm/models/fields.py:171 +#: bookwyrm/models/fields.py:179 msgid "A user with that username already exists." msgstr "Dieser Benutzename ist bereits vergeben." -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:123 +msgid "Home Timeline" +msgstr "" + +#: bookwyrm/settings.py:123 +msgid "Home" +msgstr "" + +#: bookwyrm/settings.py:124 +#, fuzzy +#| msgid "Title" +msgid "Books Timeline" +msgstr "Titel" + +#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/templates/search/layout.html:42 +#: bookwyrm/templates/user/layout.html:81 +#, fuzzy +#| msgid "Book" +msgid "Books" +msgstr "Buch" + +#: bookwyrm/settings.py:170 msgid "English" msgstr "Englisch" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:171 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:172 msgid "Spanish" msgstr "Spanisch" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:173 msgid "French" msgstr "Französisch" -#: bookwyrm/settings.py:160 +#: bookwyrm/settings.py:174 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" +#: bookwyrm/settings.py:175 +msgid "Traditional Chinese" +msgstr "" + #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" msgstr "Nicht gefunden" @@ -146,36 +172,46 @@ msgstr "Etwas lief schief. Entschuldigung!" msgid "Edit Author" msgstr "Autor*in editieren" -#: bookwyrm/templates/author/author.html:32 -#: bookwyrm/templates/author/edit_author.html:38 +#: bookwyrm/templates/author/author.html:34 +#: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" msgstr "" -#: bookwyrm/templates/author/author.html:38 +#: bookwyrm/templates/author/author.html:45 msgid "Born:" msgstr "" -#: bookwyrm/templates/author/author.html:44 +#: bookwyrm/templates/author/author.html:52 msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:51 +#: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:55 -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/author/author.html:69 +#: bookwyrm/templates/book/book.html:95 msgid "View on OpenLibrary" msgstr "In OpenLibrary ansehen" -#: bookwyrm/templates/author/author.html:60 -#: bookwyrm/templates/book/book.html:81 +#: bookwyrm/templates/author/author.html:77 +#: bookwyrm/templates/book/book.html:98 #, fuzzy #| msgid "View on OpenLibrary" msgid "View on Inventaire" msgstr "In OpenLibrary ansehen" -#: bookwyrm/templates/author/author.html:74 +#: bookwyrm/templates/author/author.html:85 +#, fuzzy +#| msgid "View on OpenLibrary" +msgid "View on LibraryThing" +msgstr "In OpenLibrary ansehen" + +#: bookwyrm/templates/author/author.html:93 +msgid "View on Goodreads" +msgstr "" + +#: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" msgstr "Bücher von %(name)s" @@ -187,232 +223,232 @@ msgid "Edit Author:" msgstr "Autor*in editieren" #: bookwyrm/templates/author/edit_author.html:13 -#: bookwyrm/templates/book/edit_book.html:18 +#: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" msgstr "Hinzugefügt:" #: bookwyrm/templates/author/edit_author.html:14 -#: bookwyrm/templates/book/edit_book.html:19 +#: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" msgstr "Aktualisiert:" #: 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 "Zuletzt bearbeitet von:" #: bookwyrm/templates/author/edit_author.html:31 -#: bookwyrm/templates/book/edit_book.html:90 +#: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" msgstr "Metadaten" -#: 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 "" -#: 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 #, 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 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:51 +#: bookwyrm/templates/author/edit_author.html:57 msgid "Wikipedia link:" msgstr "Wikipedialink:" -#: bookwyrm/templates/author/edit_author.html:57 +#: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" msgstr "Geburtsdatum:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" msgstr "Todesdatum:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" msgstr "Autor*innenidentifikatoren" -#: bookwyrm/templates/author/edit_author.html:74 +#: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" msgstr "" -#: 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 #, fuzzy #| msgid "View on OpenLibrary" msgid "Inventaire ID:" msgstr "In OpenLibrary ansehen" -#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:89 +#: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:98 -#: bookwyrm/templates/book/book.html:124 -#: bookwyrm/templates/book/edit_book.html:263 +#: bookwyrm/templates/author/edit_author.html:116 +#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/edit_book.html:321 +#: bookwyrm/templates/book/readthrough.html:77 #: bookwyrm/templates/lists/form.html:42 -#: bookwyrm/templates/preferences/edit_user.html:70 +#: bookwyrm/templates/preferences/edit_user.html:78 #: 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/snippets/readthrough.html:77 +#: bookwyrm/templates/settings/site.html:108 #: 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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "Speichern" -#: bookwyrm/templates/author/edit_author.html:99 -#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 +#: bookwyrm/templates/author/edit_author.html:117 +#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:264 +#: bookwyrm/templates/book/edit_book.html:322 +#: bookwyrm/templates/book/readthrough.html:78 #: bookwyrm/templates/moderation/report_modal.html:34 #: 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 #: 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/start_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" msgstr "Abbrechen" -#: bookwyrm/templates/book/book.html:31 +#: bookwyrm/templates/book/book.html:48 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" msgstr "von" -#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 +#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 msgid "Edit Book" msgstr "Buch editieren" -#: bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:74 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "Cover hinzufügen" -#: bookwyrm/templates/book/book.html:61 +#: bookwyrm/templates/book/book.html:78 #, fuzzy #| msgid "Failed to load" msgid "Failed to load cover" msgstr "Laden fehlgeschlagen" -#: bookwyrm/templates/book/book.html:101 +#: bookwyrm/templates/book/book.html:118 #, 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:113 +#: bookwyrm/templates/book/book.html:130 msgid "Add Description" msgstr "Beschreibung hinzufügen" -#: bookwyrm/templates/book/book.html:120 -#: bookwyrm/templates/book/edit_book.html:108 +#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Beschreibung:" -#: bookwyrm/templates/book/book.html:134 +#: bookwyrm/templates/book/book.html:151 #, fuzzy, python-format #| msgid "%(title)s by " msgid "%(count)s editions" msgstr "%(title)s von" -#: bookwyrm/templates/book/book.html:142 +#: bookwyrm/templates/book/book.html:159 #, fuzzy, python-format #| msgid "Direct Messages with %(username)s" msgid "This edition is on your %(shelf_name)s shelf." msgstr "Direktnachrichten mit %(username)s" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:165 #, fuzzy, python-format #| msgid " added %(book_title)s to your list \"%(list_name)s\"" msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "hat %(book_title)s zu deiner Liste \"%(list_name)s\" Hinzugefügt" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:176 msgid "Your reading activity" msgstr "Deine Leseaktivität" -#: bookwyrm/templates/book/book.html:162 +#: bookwyrm/templates/book/book.html:179 msgid "Add read dates" msgstr "Lesedaten hinzufügen" -#: bookwyrm/templates/book/book.html:171 +#: bookwyrm/templates/book/book.html:188 msgid "Create" msgstr "Erstellen" -#: bookwyrm/templates/book/book.html:181 +#: bookwyrm/templates/book/book.html:198 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 +#: bookwyrm/templates/book/book.html:217 #, fuzzy #| msgid "Review" msgid "Reviews" msgstr "Bewerten" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:222 #, fuzzy #| msgid "Your shelves" msgid "Your reviews" msgstr "Deine Regale" -#: bookwyrm/templates/book/book.html:211 +#: bookwyrm/templates/book/book.html:228 #, fuzzy #| msgid "Your Account" msgid "Your comments" msgstr "Dein Account" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:234 #, fuzzy #| msgid "Your books" msgid "Your quotes" msgstr "Deine Bücher" -#: bookwyrm/templates/book/book.html:253 +#: bookwyrm/templates/book/book.html:270 msgid "Subjects" msgstr "Themen" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:282 msgid "Places" msgstr "Orte" -#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 #: 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:68 +#: bookwyrm/templates/user/layout.html:75 msgid "Lists" msgstr "Listen" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:304 #, fuzzy #| msgid "Go to list" msgid "Add to list" msgstr "Zur Liste" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:314 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -423,24 +459,24 @@ msgid "ISBN:" msgstr "" #: 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 "OCLC Nummer:" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:253 +#: bookwyrm/templates/book/edit_book.html:309 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit_book.html:192 +#: bookwyrm/templates/book/edit_book.html:229 #, fuzzy #| msgid "Add cover" msgid "Upload cover:" msgstr "Cover hinzufügen" #: 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 "Cover von URL laden:" @@ -458,137 +494,143 @@ msgstr "Editionen von %(book_title)s" msgid "Add Book" msgstr "Bücher hinzufügen" -#: bookwyrm/templates/book/edit_book.html:40 +#: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" msgstr "Buchinfo bestätigen" -#: bookwyrm/templates/book/edit_book.html:47 +#: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" msgstr "Existiert \"%(name)s\" bereits als Autor:in?" -#: bookwyrm/templates/book/edit_book.html:52 +#: bookwyrm/templates/book/edit_book.html:71 #, fuzzy, python-format #| msgid "Start \"%(book_title)s\"" msgid "Author of %(book_title)s" msgstr "\"%(book_title)s\" beginnen" -#: bookwyrm/templates/book/edit_book.html:55 +#: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" msgstr "Neue:r Autor:in" -#: bookwyrm/templates/book/edit_book.html:61 +#: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" msgstr "Neu als Autor:in erstellen: %(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 "Ist das eine Edition eines vorhandenen Werkes?" -#: bookwyrm/templates/book/edit_book.html:71 +#: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" msgstr "Dies ist ein neues Werk." -#: bookwyrm/templates/book/edit_book.html:77 +#: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" msgstr "Bestätigen" -#: bookwyrm/templates/book/edit_book.html:79 +#: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" msgstr "Zurück" -#: bookwyrm/templates/book/edit_book.html:93 +#: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" msgstr "Titel:" -#: bookwyrm/templates/book/edit_book.html:101 +#: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" msgstr "Untertitel:" -#: bookwyrm/templates/book/edit_book.html:114 +#: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" msgstr "Serie:" -#: bookwyrm/templates/book/edit_book.html:122 +#: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" msgstr "Seriennummer:" -#: bookwyrm/templates/book/edit_book.html:130 +#: bookwyrm/templates/book/edit_book.html:160 #, fuzzy #| msgid "Pages:" msgid "Languages:" msgstr "Seiten:" -#: bookwyrm/templates/book/edit_book.html:139 +#: bookwyrm/templates/book/edit_book.html:169 #, fuzzy #| msgid "Published" msgid "Publisher:" msgstr "Veröffentlicht" -#: bookwyrm/templates/book/edit_book.html:148 +#: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" msgstr "Erstveröffentlichungsdatum:" -#: bookwyrm/templates/book/edit_book.html:156 +#: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" msgstr "Veröffentlichungsdatum:" -#: bookwyrm/templates/book/edit_book.html:165 +#: bookwyrm/templates/book/edit_book.html:195 #, fuzzy #| msgid "Author" msgid "Authors" msgstr "Autor*in" -#: bookwyrm/templates/book/edit_book.html:171 +#: bookwyrm/templates/book/edit_book.html:202 #, fuzzy, python-format -#| msgid "Direct Messages with %(username)s" -msgid "Remove %(name)s" -msgstr "Direktnachrichten mit %(username)s" +#| msgid "Lists: %(username)s" +msgid "Remove %(name)s" +msgstr "Listen: %(username)s" -#: bookwyrm/templates/book/edit_book.html:176 +#: bookwyrm/templates/book/edit_book.html:205 +#, fuzzy, python-format +#| msgid "Lists: %(username)s" +msgid "Author page for %(name)s" +msgstr "Listen: %(username)s" + +#: bookwyrm/templates/book/edit_book.html:212 #, fuzzy #| msgid "Edit Author" msgid "Add Authors:" msgstr "Autor*in editieren" -#: bookwyrm/templates/book/edit_book.html:177 +#: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" msgstr "" -#: bookwyrm/templates/book/edit_book.html:183 +#: bookwyrm/templates/book/edit_book.html:220 #: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit_book.html:211 +#: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" msgstr "Physikalische Eigenschaften" -#: bookwyrm/templates/book/edit_book.html:212 +#: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:220 +#: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" msgstr "Seiten:" -#: bookwyrm/templates/book/edit_book.html:227 +#: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" msgstr "Buchidentifikatoren" -#: bookwyrm/templates/book/edit_book.html:228 +#: bookwyrm/templates/book/edit_book.html:269 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:233 +#: bookwyrm/templates/book/edit_book.html:277 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:238 +#: bookwyrm/templates/book/edit_book.html:285 msgid "Openlibrary ID:" msgstr "" @@ -652,11 +694,40 @@ msgstr "Veröffentlicht von %(publisher)s." msgid "rated it" msgstr "bewertet" +#: bookwyrm/templates/book/readthrough.html:8 +msgid "Progress Updates:" +msgstr "Fortschrittsupdates:" + +#: bookwyrm/templates/book/readthrough.html:14 +msgid "finished" +msgstr "Abgeschlossen" + +#: bookwyrm/templates/book/readthrough.html:25 +msgid "Show all updates" +msgstr "Zeige alle Updates" + +#: bookwyrm/templates/book/readthrough.html:41 +msgid "Delete this progress update" +msgstr "Dieses Fortschrittsupdate löschen" + +#: bookwyrm/templates/book/readthrough.html:52 +msgid "started" +msgstr "Angefangen" + +#: bookwyrm/templates/book/readthrough.html:59 +#: bookwyrm/templates/book/readthrough.html:73 +msgid "Edit read dates" +msgstr "Lesedaten bearbeiten" + +#: bookwyrm/templates/book/readthrough.html:63 +msgid "Delete these read dates" +msgstr "Diese Lesedaten löschen" + #: 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/feed/layout.html:71 +#: bookwyrm/templates/get_started/layout.html:20 +#: bookwyrm/templates/get_started/layout.html:53 #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" @@ -668,6 +739,58 @@ msgstr "Schließen" msgid "Compose status" msgstr "Status teilen" +#: bookwyrm/templates/confirm_email/confirm_email.html:4 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm email" +msgstr "Bestätigen" + +#: bookwyrm/templates/confirm_email/confirm_email.html:7 +#, fuzzy +#| msgid "Email address:" +msgid "Confirm your email address" +msgstr "E-Mail Adresse" + +#: bookwyrm/templates/confirm_email/confirm_email.html:13 +msgid "A confirmation code has been sent to the email address you used to register your account." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:15 +msgid "Sorry! We couldn't find that code." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:19 +#, fuzzy +#| msgid "Confirm password:" +msgid "Confirmation code:" +msgstr "Passwort bestätigen:" + +#: bookwyrm/templates/confirm_email/confirm_email.html:25 +#: bookwyrm/templates/discover/landing_layout.html:70 +#: bookwyrm/templates/moderation/report_modal.html:33 +msgid "Submit" +msgstr "Absenden" + +#: bookwyrm/templates/confirm_email/confirm_email.html:32 +msgid "Can't find your code?" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:4 +msgid "Resend confirmation link" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:11 +#: 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/confirm_email/resend_form.html:17 +msgid "Resend link" +msgstr "" + #: bookwyrm/templates/directory/community_filter.html:5 #, fuzzy #| msgid "Comment" @@ -688,7 +811,7 @@ msgstr "Föderiert" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/layout.html:71 msgid "Directory" msgstr "" @@ -722,7 +845,16 @@ msgstr "Vorschlagen" msgid "Recently active" msgstr "" -#: bookwyrm/templates/directory/user_card.html:33 +#: bookwyrm/templates/directory/user_card.html:17 +#: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/user/user_preview.html:16 +#: bookwyrm/templates/user/user_preview.html:17 +#, fuzzy +#| msgid "Your Account" +msgid "Locked account" +msgstr "Dein Account" + +#: bookwyrm/templates/directory/user_card.html:40 #, fuzzy #| msgid "followed you" msgid "follower you follow" @@ -730,7 +862,7 @@ msgid_plural "followers you follow" msgstr[0] "folgt dir" msgstr[1] "folgt dir" -#: bookwyrm/templates/directory/user_card.html:40 +#: bookwyrm/templates/directory/user_card.html:47 #, fuzzy #| msgid "Your shelves" msgid "book on your shelves" @@ -738,11 +870,11 @@ msgid_plural "books on your shelves" msgstr[0] "Deine Regale" msgstr[1] "Deine Regale" -#: bookwyrm/templates/directory/user_card.html:48 +#: bookwyrm/templates/directory/user_card.html:55 msgid "posts" msgstr "" -#: bookwyrm/templates/directory/user_card.html:54 +#: bookwyrm/templates/directory/user_card.html:61 msgid "last active" msgstr "" @@ -780,7 +912,7 @@ msgid "Recent Books" msgstr "Aktive Bücher" #: bookwyrm/templates/discover/landing_layout.html:5 -#: bookwyrm/templates/get_started/layout.html:4 +#: bookwyrm/templates/get_started/layout.html:5 msgid "Welcome" msgstr "Willkommen" @@ -802,7 +934,7 @@ msgid "Join %(name)s" msgstr "Tritt %(name)s bei" #: bookwyrm/templates/discover/landing_layout.html:51 -#: bookwyrm/templates/login.html:51 +#: bookwyrm/templates/login.html:56 msgid "This instance is closed" msgstr "Diese Instanz ist geschlossen" @@ -814,22 +946,26 @@ msgstr "" 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:33 -msgid "Submit" -msgstr "Absenden" - #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" msgstr "Dein Account" +#: bookwyrm/templates/email/confirm/html_content.html:6 +#: bookwyrm/templates/email/confirm/text_content.html:4 +#, python-format +msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:11 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm Email" +msgstr "Bestätigen" + +#: bookwyrm/templates/email/confirm/subject.html:2 +msgid "Please confirm your email" +msgstr "" + #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," @@ -902,7 +1038,7 @@ msgid "Direct Messages with %(username)s" msgstr "Direktnachrichten mit %(username)s" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:99 msgid "Direct Messages" msgstr "Direktnachrichten" @@ -914,99 +1050,58 @@ msgstr "Alle Nachrichten" msgid "You have no messages right now." msgstr "Du hast momentan keine Nachrichten." -#: bookwyrm/templates/feed/feed.html:8 -msgid "Home Timeline" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:10 -msgid "Local Timeline" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:12 -#, fuzzy -#| msgid "Federated Servers" -msgid "Federated Timeline" -msgstr "Föderierende Server" - -#: bookwyrm/templates/feed/feed.html:18 -msgid "Home" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:21 -msgid "Local" -msgstr "Lokal" - -#: bookwyrm/templates/feed/feed.html:24 -#: bookwyrm/templates/settings/edit_server.html:40 -msgid "Federated" -msgstr "Föderiert" - -#: bookwyrm/templates/feed/feed.html:32 +#: bookwyrm/templates/feed/feed.html:22 #, python-format -msgid "load 0 unread status(es)" +msgid "load 0 unread status(es)" msgstr "" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:38 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:55 -#: bookwyrm/templates/get_started/users.html:6 -msgid "Who to follow" -msgstr "" - -#: bookwyrm/templates/feed/feed_layout.html:4 +#: bookwyrm/templates/feed/layout.html:5 msgid "Updates" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:10 +#: bookwyrm/templates/feed/layout.html:12 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "Deine Bücher" -#: bookwyrm/templates/feed/feed_layout.html:12 +#: bookwyrm/templates/feed/layout.html:14 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/layout.html:25 #: bookwyrm/templates/user/shelf/shelf.html:29 #, fuzzy #| msgid "Read" msgid "To Read" msgstr "Auf der Leseliste" -#: bookwyrm/templates/feed/feed_layout.html:24 +#: bookwyrm/templates/feed/layout.html:26 #: bookwyrm/templates/user/shelf/shelf.html:29 #, fuzzy #| msgid "Start reading" msgid "Currently Reading" msgstr "Gerade lesend" -#: bookwyrm/templates/feed/feed_layout.html:25 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 +#: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" msgstr "Gelesen" -#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 +#: bookwyrm/templates/feed/layout.html:90 bookwyrm/templates/goal.html:26 #: bookwyrm/templates/snippets/goal_card.html:6 #, python-format 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/feed/suggested_users.html:3 +#: bookwyrm/templates/get_started/users.html:6 +msgid "Who to follow" +msgstr "" #: bookwyrm/templates/get_started/book_preview.html:6 #, fuzzy, python-format @@ -1040,7 +1135,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:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45 #: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 @@ -1069,40 +1164,40 @@ msgstr "Keine Bücher gefunden" msgid "Save & continue" msgstr "" -#: bookwyrm/templates/get_started/layout.html:14 +#: bookwyrm/templates/get_started/layout.html:15 #, 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:16 +#: bookwyrm/templates/get_started/layout.html:17 msgid "These are some first steps to get you started." msgstr "" -#: bookwyrm/templates/get_started/layout.html:30 +#: bookwyrm/templates/get_started/layout.html:31 #: bookwyrm/templates/get_started/profile.html:6 #, fuzzy #| msgid "User Profile" msgid "Create your profile" msgstr "Benutzerprofil" -#: bookwyrm/templates/get_started/layout.html:34 +#: bookwyrm/templates/get_started/layout.html:35 #, fuzzy #| msgid "Add Books" msgid "Add books" msgstr "Bücher hinzufügen" -#: bookwyrm/templates/get_started/layout.html:38 +#: bookwyrm/templates/get_started/layout.html:39 #, fuzzy #| msgid "Friendly" msgid "Find friends" msgstr "Freundlich" -#: bookwyrm/templates/get_started/layout.html:44 +#: bookwyrm/templates/get_started/layout.html:45 msgid "Skip this step" msgstr "" -#: bookwyrm/templates/get_started/layout.html:48 +#: bookwyrm/templates/get_started/layout.html:49 #, fuzzy #| msgid "Finished" msgid "Finish" @@ -1133,7 +1228,7 @@ msgid "Manually approve followers:" msgstr "Folgende manuell bestätigen" #: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:58 +#: bookwyrm/templates/preferences/edit_user.html:66 msgid "Show this account in suggested users:" msgstr "" @@ -1218,75 +1313,92 @@ msgstr "Aktuelle Importe" msgid "No recent imports" msgstr "Keine aktuellen Importe" -#: bookwyrm/templates/import_status.html:5 -#: bookwyrm/templates/import_status.html:9 +#: bookwyrm/templates/import_status.html:6 +#: bookwyrm/templates/import_status.html:10 msgid "Import Status" msgstr "Importstatus" -#: bookwyrm/templates/import_status.html:12 +#: bookwyrm/templates/import_status.html:11 +#, fuzzy +#| msgid "Back to reports" +msgid "Back to imports" +msgstr "Zurück zu den Meldungen" + +#: bookwyrm/templates/import_status.html:15 msgid "Import started:" msgstr "Import gestartet:" -#: bookwyrm/templates/import_status.html:16 +#: bookwyrm/templates/import_status.html:20 msgid "Import completed:" msgstr "Import abgeschlossen:" -#: bookwyrm/templates/import_status.html:19 +#: bookwyrm/templates/import_status.html:25 msgid "TASK FAILED" msgstr "AUFGABE GESCHEITERT" -#: bookwyrm/templates/import_status.html:25 +#: bookwyrm/templates/import_status.html:32 msgid "Import still in progress." msgstr "Import läuft noch." -#: bookwyrm/templates/import_status.html:27 +#: bookwyrm/templates/import_status.html:34 msgid "(Hit reload to update!)" msgstr "(Aktualisiere für ein Update!)" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import_status.html:41 msgid "Failed to load" msgstr "Laden fehlgeschlagen" -#: bookwyrm/templates/import_status.html:43 +#: bookwyrm/templates/import_status.html:50 #, 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:78 +#: bookwyrm/templates/import_status.html:62 +#, python-format +msgid "Line %(index)s: %(title)s by %(author)s" +msgstr "" + +#: bookwyrm/templates/import_status.html:82 msgid "Select all" msgstr "Alle auswählen" -#: bookwyrm/templates/import_status.html:81 +#: bookwyrm/templates/import_status.html:85 msgid "Retry items" msgstr "Punkte erneut versuchen" -#: bookwyrm/templates/import_status.html:107 +#: bookwyrm/templates/import_status.html:112 msgid "Successfully imported" msgstr "Erfolgreich importiert" -#: bookwyrm/templates/import_status.html:111 +#: bookwyrm/templates/import_status.html:114 +#, fuzzy +#| msgid "Import still in progress." +msgid "Import Progress" +msgstr "Import läuft noch." + +#: bookwyrm/templates/import_status.html:119 msgid "Book" msgstr "Buch" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import_status.html:122 #: 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 "Titel" -#: bookwyrm/templates/import_status.html:117 +#: bookwyrm/templates/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" msgstr "Autor*in" -#: bookwyrm/templates/import_status.html:140 +#: bookwyrm/templates/import_status.html:148 msgid "Imported" msgstr "Importiert" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 -#: bookwyrm/templates/login.html:46 +#: bookwyrm/templates/login.html:51 msgid "Create an Account" msgstr "Erstelle einen Account" @@ -1311,29 +1423,29 @@ msgstr "Suchergebnisse für \"%(query)s\"" msgid "Matching Books" msgstr "Passende Bücher" -#: bookwyrm/templates/layout.html:33 +#: bookwyrm/templates/layout.html:40 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:54 bookwyrm/templates/layout.html:55 msgid "Main navigation menu" msgstr "Navigationshauptmenü" -#: bookwyrm/templates/layout.html:58 +#: bookwyrm/templates/layout.html:65 msgid "Feed" msgstr "" -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:94 #, fuzzy #| msgid "Your books" msgid "Your Books" msgstr "Deine Bücher" -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/layout.html:104 msgid "Settings" msgstr "Einstellungen" -#: bookwyrm/templates/layout.html:106 +#: bookwyrm/templates/layout.html:113 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1341,65 +1453,65 @@ msgstr "Einstellungen" msgid "Invites" msgstr "Einladungen" -#: bookwyrm/templates/layout.html:113 +#: bookwyrm/templates/layout.html:120 msgid "Admin" msgstr "" -#: bookwyrm/templates/layout.html:120 +#: bookwyrm/templates/layout.html:127 msgid "Log out" msgstr "Abmelden" -#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 +#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "Benachrichtigungen" -#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 -#: bookwyrm/templates/login.html:17 +#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162 +#: bookwyrm/templates/login.html:22 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "" -#: bookwyrm/templates/layout.html:156 +#: bookwyrm/templates/layout.html:163 msgid "password" msgstr "Passwort" -#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 -#: bookwyrm/templates/login.html:33 +#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/login.html:38 msgid "Log in" msgstr "Anmelden" -#: bookwyrm/templates/layout.html:168 +#: bookwyrm/templates/layout.html:175 msgid "Join" msgstr "" -#: bookwyrm/templates/layout.html:206 +#: bookwyrm/templates/layout.html:213 #, fuzzy #| msgid "About this server" msgid "About this instance" msgstr "Über diesen Server" -#: bookwyrm/templates/layout.html:210 +#: bookwyrm/templates/layout.html:217 msgid "Contact site admin" msgstr "Admin kontaktieren" -#: bookwyrm/templates/layout.html:214 +#: bookwyrm/templates/layout.html:221 #, fuzzy #| msgid "List curation:" msgid "Documentation" msgstr "Listenkuratierung:" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:228 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "%(site_name)s auf %(support_title)s unterstützen" -#: bookwyrm/templates/layout.html:225 +#: bookwyrm/templates/layout.html:232 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "BookWyrm ist open source Software. Du kannst dich auf GitHub beteiligen oder etwas melden." @@ -1563,16 +1675,20 @@ msgstr "Deine Listen" msgid "Login" msgstr "" -#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 +#: bookwyrm/templates/login.html:16 +msgid "Success! Email address confirmed." +msgstr "" + +#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" msgstr "Passwort:" -#: bookwyrm/templates/login.html:52 +#: bookwyrm/templates/login.html:57 msgid "Contact an administrator to get an invite" msgstr "Kontaktiere für eine Einladung eine*n Admin" -#: bookwyrm/templates/login.html:63 +#: bookwyrm/templates/login.html:68 msgid "More about this site" msgstr "Mehr über diese Seite" @@ -1809,6 +1925,7 @@ msgstr "Du bist auf dem neusten Stand!" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Passwort bestätigen:" @@ -1822,7 +1939,7 @@ msgstr "Passwort zurücksetzen" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/preferences_layout.html:26 +#: bookwyrm/templates/preferences/layout.html:30 msgid "Blocked Users" msgstr "Blockierte Nutzer*innen" @@ -1833,7 +1950,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:19 +#: bookwyrm/templates/preferences/layout.html:19 msgid "Change Password" msgstr "Passwort ändern" @@ -1841,6 +1958,23 @@ msgstr "Passwort ändern" msgid "New password:" msgstr "Neues Passwort:" +#: bookwyrm/templates/preferences/delete_user.html:4 +#: bookwyrm/templates/preferences/delete_user.html:7 +#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/layout.html:23 +#, fuzzy +#| msgid "Create an Account" +msgid "Delete Account" +msgstr "Erstelle einen Account" + +#: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Permanently delete account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:14 +msgid "Deleting your account cannot be undone. The username will not be available to register in the future." +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" @@ -1850,44 +1984,68 @@ msgstr "Profil bearbeiten:" msgid "Show set reading goal prompt in feed:" msgstr "Angegebenes Leseziel im Feed anzeigen." -#: bookwyrm/templates/preferences/edit_user.html:62 +#: bookwyrm/templates/preferences/edit_user.html:58 +#, fuzzy +#| msgid "Goal privacy:" +msgid "Default post privacy:" +msgstr "Sichtbarkeit des Ziels" + +#: bookwyrm/templates/preferences/edit_user.html:70 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:65 +#: bookwyrm/templates/preferences/edit_user.html:73 msgid "Preferred Timezone: " msgstr "" -#: bookwyrm/templates/preferences/preferences_layout.html:11 +#: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "" -#: bookwyrm/templates/preferences/preferences_layout.html:15 +#: bookwyrm/templates/preferences/layout.html:15 msgid "Profile" msgstr "Profil" -#: bookwyrm/templates/preferences/preferences_layout.html:22 +#: bookwyrm/templates/preferences/layout.html:26 msgid "Relationships" msgstr "Beziehungen" +#: bookwyrm/templates/reading_progress/finish.html:5 +#, fuzzy, python-format +#| msgid "Finish \"%(book_title)s\"" +msgid "Finish \"%(book_title)s\"" +msgstr "\"%(book_title)s\" abschließen" + +#: bookwyrm/templates/reading_progress/start.html:5 +#, fuzzy, python-format +#| msgid "Editions of %(book_title)s" +msgid "Start \"%(book_title)s\"" +msgstr "Editionen von %(book_title)s" + +#: bookwyrm/templates/reading_progress/want.html:5 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Want to Read \"%(book_title)s\"" +msgstr "\"%(book_title)s\" auf Leseliste setzen" + #: bookwyrm/templates/rss/title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 +#: bookwyrm/templates/snippets/status/status_header.html:36 msgid "rated" msgstr "" #: bookwyrm/templates/rss/title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 +#: bookwyrm/templates/snippets/status/status_header.html:38 msgid "reviewed" msgstr "bewertete" #: bookwyrm/templates/rss/title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 +#: bookwyrm/templates/snippets/status/status_header.html:40 msgid "commented on" msgstr "kommentierte" #: bookwyrm/templates/rss/title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 +#: bookwyrm/templates/snippets/status/status_header.html:42 msgid "quoted" msgstr "zitierte" @@ -1917,14 +2075,6 @@ msgstr "Suche nach Buch oder Benutzer*in" msgid "Search type" msgstr "Suche" -#: bookwyrm/templates/search/layout.html:21 -#: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:74 -#, 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 @@ -2139,6 +2289,10 @@ msgstr "Instanzname" msgid "Status:" msgstr "Importstatus" +#: bookwyrm/templates/settings/edit_server.html:40 +msgid "Federated" +msgstr "Föderiert" + #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 #, fuzzy @@ -2169,7 +2323,7 @@ msgid "Details" msgstr "" #: bookwyrm/templates/settings/federated_server.html:39 -#: bookwyrm/templates/user/layout.html:56 +#: bookwyrm/templates/user/layout.html:63 msgid "Activity" msgstr "Aktivität" @@ -2218,7 +2372,7 @@ msgid "Edit" msgstr "Buch editieren" #: bookwyrm/templates/settings/federated_server.html:105 -#: bookwyrm/templates/user_admin/user_moderation_actions.html:3 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:8 #, fuzzy #| msgid "Notifications" msgid "Actions" @@ -2448,17 +2602,27 @@ msgstr "" msgid "Additional info:" msgstr "" -#: bookwyrm/templates/settings/site.html:83 -msgid "Allow registration:" +#: bookwyrm/templates/settings/site.html:85 +#, fuzzy +#| msgid "Allow registration:" +msgid "Allow registration" msgstr "Registrierungen erlauben" -#: bookwyrm/templates/settings/site.html:87 +#: bookwyrm/templates/settings/site.html:91 #, fuzzy #| msgid "Follow Requests" -msgid "Allow invite requests:" +msgid "Allow invite requests" msgstr "Folgeanfragen" -#: bookwyrm/templates/settings/site.html:91 +#: bookwyrm/templates/settings/site.html:97 +msgid "Require users to confirm email address" +msgstr "" + +#: bookwyrm/templates/settings/site.html:99 +msgid "(Recommended if registration is open)" +msgstr "" + +#: bookwyrm/templates/settings/site.html:102 msgid "Registration closed text:" msgstr "Registrierungen geschlossen text" @@ -2468,15 +2632,23 @@ msgstr "Registrierungen geschlossen text" msgid "Posted by %(username)s" msgstr "Direktnachrichten mit %(username)s" -#: bookwyrm/templates/snippets/book_cover.html:31 +#: bookwyrm/templates/snippets/authors.html:22 +#, python-format +msgid "and %(remainder_count_display)s other" +msgid_plural "and %(remainder_count_display)s others" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/book_cover.html:32 #, fuzzy #| msgid "Add cover" msgid "No cover" msgstr "Cover hinzufügen" -#: bookwyrm/templates/snippets/book_titleby.html:4 -#, python-format -msgid "%(title)s by " +#: bookwyrm/templates/snippets/book_titleby.html:6 +#, fuzzy, python-format +#| msgid "%(title)s by " +msgid "%(title)s by" msgstr "%(title)s von " #: bookwyrm/templates/snippets/boost_button.html:20 @@ -2570,7 +2742,7 @@ msgstr "Spoileralarm aktivieren" #: 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 +#: bookwyrm/templates/snippets/privacy_select.html:20 msgid "Private" msgstr "Privat" @@ -2696,7 +2868,7 @@ 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/start_reading_modal.html:31 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" msgstr "Posten" @@ -2742,13 +2914,13 @@ msgstr "Weiter" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 -#: bookwyrm/templates/snippets/privacy_select.html:10 +#: bookwyrm/templates/snippets/privacy_select.html:11 msgid "Public" msgstr "Öffentlich" #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 -#: bookwyrm/templates/snippets/privacy_select.html:13 +#: bookwyrm/templates/snippets/privacy_select.html:14 msgid "Unlisted" msgstr "Ungelistet" @@ -2760,7 +2932,7 @@ msgstr "Nur für Folgende" msgid "Post privacy" msgstr "" -#: bookwyrm/templates/snippets/privacy_select.html:16 +#: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" @@ -2774,38 +2946,9 @@ msgstr "Raten" msgid "Rate" msgstr "" -#: bookwyrm/templates/snippets/readthrough.html:8 -msgid "Progress Updates:" -msgstr "Fortschrittsupdates:" - -#: bookwyrm/templates/snippets/readthrough.html:14 -msgid "finished" -msgstr "Abgeschlossen" - -#: bookwyrm/templates/snippets/readthrough.html:25 -msgid "Show all updates" -msgstr "Zeige alle Updates" - -#: bookwyrm/templates/snippets/readthrough.html:41 -msgid "Delete this progress update" -msgstr "Dieses Fortschrittsupdate löschen" - -#: bookwyrm/templates/snippets/readthrough.html:52 -msgid "started" -msgstr "Angefangen" - -#: bookwyrm/templates/snippets/readthrough.html:59 -#: bookwyrm/templates/snippets/readthrough.html:73 -msgid "Edit read dates" -msgstr "Lesedaten bearbeiten" - -#: bookwyrm/templates/snippets/readthrough.html:63 -msgid "Delete these read dates" -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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "Zu lesen angefangen" @@ -2844,7 +2987,7 @@ msgid "Finish \"%(book_title)s\"" msgstr "\"%(book_title)s\" abschließen" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 #, fuzzy #| msgid "Progress" msgid "Update progress" @@ -2854,20 +2997,20 @@ msgstr "Fortschritt" msgid "More shelves" msgstr "Mehr Regale" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11 msgid "Start reading" msgstr "Zu lesen beginnen" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19 msgid "Finish reading" msgstr "Lesen abschließen" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 #: 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:47 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57 #, fuzzy, python-format #| msgid "Lists: %(username)s" msgid "Remove from %(name)s" @@ -2883,17 +3026,17 @@ msgstr "\"%(book_title)s\" beginnen" msgid "Want to Read \"%(book_title)s\"" msgstr "\"%(book_title)s\" auf Leseliste setzen" -#: bookwyrm/templates/snippets/status/content_status.html:71 +#: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" msgstr "Mehr anzeigen" -#: bookwyrm/templates/snippets/status/content_status.html:86 +#: bookwyrm/templates/snippets/status/content_status.html:87 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" msgstr "Weniger anzeigen" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:117 msgid "Open image in new window" msgstr "Bild in neuem Fenster öffnen" @@ -2916,7 +3059,7 @@ msgstr "Status favorisieren" msgid "boosted" msgstr "teilt" -#: bookwyrm/templates/snippets/status/status_header.html:45 +#: bookwyrm/templates/snippets/status/status_header.html:46 #, fuzzy, python-format #| msgid "replied to your status" msgid "replied to %(username)s's status" @@ -2935,10 +3078,31 @@ 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 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:12 msgid "Send direct message" msgstr "Direktnachricht senden" +#: bookwyrm/templates/snippets/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/snippets/suggested_users.html:23 +#, 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/snippets/suggested_users.html:31 +#: bookwyrm/templates/user/user_preview.html:36 +#, fuzzy +#| msgid "followed you" +msgid "Follows you" +msgstr "folgt dir" + #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" msgstr "Zu dieser Edition wechseln" @@ -2955,15 +3119,15 @@ msgstr "Zu lesen angefangen" msgid "Sorted descending" msgstr "Zu lesen angefangen" -#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 +#: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Benutzerprofil" -#: bookwyrm/templates/user/layout.html:37 +#: bookwyrm/templates/user/layout.html:44 msgid "Follow Requests" msgstr "Folgeanfragen" -#: bookwyrm/templates/user/layout.html:62 +#: bookwyrm/templates/user/layout.html:69 msgid "Reading Goal" msgstr "Leseziel" @@ -3073,24 +3237,24 @@ msgstr "" msgid "No activities yet!" msgstr "Noch keine Aktivitäten!" -#: bookwyrm/templates/user/user_preview.html:15 +#: bookwyrm/templates/user/user_preview.html:22 #, python-format msgid "Joined %(date)s" msgstr "Beigetreten %(date)s" -#: bookwyrm/templates/user/user_preview.html:19 +#: bookwyrm/templates/user/user_preview.html:26 #, 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:20 +#: bookwyrm/templates/user/user_preview.html:27 #, python-format msgid "%(counter)s following" msgstr "Folgt %(counter)s" -#: bookwyrm/templates/user/user_preview.html:26 +#: bookwyrm/templates/user/user_preview.html:34 #, fuzzy, python-format #| msgid "followed you" msgid "%(mutuals_display)s follower you follow" @@ -3098,6 +3262,12 @@ msgid_plural "%(mutuals_display)s followers you follow" msgstr[0] "folgt dir" msgstr[1] "folgt dir" +#: bookwyrm/templates/user/user_preview.html:38 +#, fuzzy +#| msgid "followed you" +msgid "No followers you follow" +msgstr "folgt dir" + #: bookwyrm/templates/user_admin/user.html:9 #, fuzzy #| msgid "Back to reports" @@ -3168,22 +3338,35 @@ msgstr "Instanzeinstellungen" msgid "View instance" msgstr "" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:11 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:5 +msgid "Permanently deleted" +msgstr "" + +#: bookwyrm/templates/user_admin/user_moderation_actions.html:17 msgid "Suspend user" msgstr "" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:13 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:19 msgid "Un-suspend user" msgstr "" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:21 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:28 msgid "Access level:" msgstr "" -#: 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 "" +#: bookwyrm/templatetags/utilities.py:30 +#, python-format +msgid "%(title)s: %(subtitle)s" +msgstr "" + +#: bookwyrm/views/authentication.py:69 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/import_data.py:67 #, fuzzy #| msgid "Email address:" @@ -3201,6 +3384,19 @@ msgstr "Dieser Benutzename ist bereits vergeben." msgid "A password reset link sent to %s" msgstr "" +#, fuzzy +#~| msgid "Federated Servers" +#~ msgid "Federated Timeline" +#~ msgstr "Föderierende Server" + +#~ msgid "Local" +#~ msgstr "Lokal" + +#, fuzzy +#~| msgid "Direct Messages with %(username)s" +#~ msgid "Remove %(name)s" +#~ msgstr "Direktnachrichten mit %(username)s" + #, fuzzy #~| msgid "Lists: %(username)s" #~ msgid "Reports: %(server_name)s" @@ -3247,11 +3443,6 @@ msgstr "" #~ msgid "Enter a valid integer." #~ msgstr "E-Mail Adresse" -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid email address." -#~ msgstr "E-Mail Adresse" - #, fuzzy #~| msgid "Email address:" #~ msgid "Enter a valid IPv4 address." diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 8c36a2cb3..e8e3b0b31 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-06 20:52+0000\n" +"POT-Creation-Date: 2021-08-07 01:35+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,99 +18,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:224 +#: bookwyrm/forms.py:232 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:246 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:239 +#: bookwyrm/forms.py:247 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:240 +#: bookwyrm/forms.py:248 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:241 +#: bookwyrm/forms.py:249 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:254 #, python-format msgid "%(count)d uses" msgstr "" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:257 msgid "Unlimited" msgstr "" -#: bookwyrm/forms.py:299 +#: bookwyrm/forms.py:307 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:300 +#: bookwyrm/forms.py:308 msgid "Book Title" msgstr "" -#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 +#: bookwyrm/forms.py:309 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 "" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:315 msgid "Ascending" msgstr "" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:316 msgid "Descending" msgstr "" -#: bookwyrm/models/fields.py:25 +#: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" msgstr "" -#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43 +#: bookwyrm/models/fields.py:36 bookwyrm/models/fields.py:45 #, python-format msgid "%(value)s is not a valid username" msgstr "" -#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 +#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159 msgid "username" msgstr "" -#: bookwyrm/models/fields.py:171 +#: bookwyrm/models/fields.py:179 msgid "A user with that username already exists." msgstr "" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:123 +msgid "Home Timeline" +msgstr "" + +#: bookwyrm/settings.py:123 +msgid "Home" +msgstr "" + +#: bookwyrm/settings.py:124 +msgid "Books Timeline" +msgstr "" + +#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/templates/search/layout.html:42 +#: bookwyrm/templates/user/layout.html:81 +msgid "Books" +msgstr "" + +#: bookwyrm/settings.py:170 msgid "English" msgstr "" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:171 msgid "German" msgstr "" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:172 msgid "Spanish" msgstr "" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:173 msgid "French" msgstr "" -#: bookwyrm/settings.py:160 +#: bookwyrm/settings.py:174 msgid "Simplified Chinese" msgstr "" +#: bookwyrm/settings.py:175 +msgid "Traditional Chinese" +msgstr "" + #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" msgstr "" @@ -136,34 +158,42 @@ msgstr "" msgid "Edit Author" msgstr "" -#: bookwyrm/templates/author/author.html:32 -#: bookwyrm/templates/author/edit_author.html:38 +#: bookwyrm/templates/author/author.html:34 +#: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" msgstr "" -#: bookwyrm/templates/author/author.html:38 +#: bookwyrm/templates/author/author.html:45 msgid "Born:" msgstr "" -#: bookwyrm/templates/author/author.html:44 +#: bookwyrm/templates/author/author.html:52 msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:51 +#: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:55 -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/author/author.html:69 +#: bookwyrm/templates/book/book.html:95 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:60 -#: bookwyrm/templates/book/book.html:81 +#: bookwyrm/templates/author/author.html:77 +#: bookwyrm/templates/book/book.html:98 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:74 +#: bookwyrm/templates/author/author.html:85 +msgid "View on LibraryThing" +msgstr "" + +#: bookwyrm/templates/author/author.html:93 +msgid "View on Goodreads" +msgstr "" + +#: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" msgstr "" @@ -173,213 +203,213 @@ msgid "Edit Author:" msgstr "" #: bookwyrm/templates/author/edit_author.html:13 -#: bookwyrm/templates/book/edit_book.html:18 +#: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" msgstr "" #: bookwyrm/templates/author/edit_author.html:14 -#: bookwyrm/templates/book/edit_book.html:19 +#: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" msgstr "" #: 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 "" #: bookwyrm/templates/author/edit_author.html:31 -#: bookwyrm/templates/book/edit_book.html:90 +#: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" msgstr "" -#: 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 "" -#: 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 "" -#: bookwyrm/templates/author/edit_author.html:46 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:51 +#: bookwyrm/templates/author/edit_author.html:57 msgid "Wikipedia link:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:57 +#: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" msgstr "" -#: bookwyrm/templates/author/edit_author.html:74 +#: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" msgstr "" -#: 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 "" -#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:89 +#: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:98 -#: bookwyrm/templates/book/book.html:124 -#: bookwyrm/templates/book/edit_book.html:263 +#: bookwyrm/templates/author/edit_author.html:116 +#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/edit_book.html:321 +#: bookwyrm/templates/book/readthrough.html:77 #: bookwyrm/templates/lists/form.html:42 -#: bookwyrm/templates/preferences/edit_user.html:70 +#: bookwyrm/templates/preferences/edit_user.html:78 #: 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/snippets/readthrough.html:77 +#: bookwyrm/templates/settings/site.html:108 #: 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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "" -#: bookwyrm/templates/author/edit_author.html:99 -#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 +#: bookwyrm/templates/author/edit_author.html:117 +#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:264 +#: bookwyrm/templates/book/edit_book.html:322 +#: bookwyrm/templates/book/readthrough.html:78 #: bookwyrm/templates/moderation/report_modal.html:34 #: 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 #: 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/start_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" msgstr "" -#: bookwyrm/templates/book/book.html:31 +#: bookwyrm/templates/book/book.html:48 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" msgstr "" -#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 +#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:74 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "" -#: bookwyrm/templates/book/book.html:61 +#: bookwyrm/templates/book/book.html:78 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:101 +#: bookwyrm/templates/book/book.html:118 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:130 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:120 -#: bookwyrm/templates/book/edit_book.html:108 +#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:134 +#: bookwyrm/templates/book/book.html:151 #, python-format msgid "%(count)s editions" msgstr "" -#: bookwyrm/templates/book/book.html:142 +#: bookwyrm/templates/book/book.html:159 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:165 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:176 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:162 +#: bookwyrm/templates/book/book.html:179 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:171 +#: bookwyrm/templates/book/book.html:188 msgid "Create" msgstr "" -#: bookwyrm/templates/book/book.html:181 +#: bookwyrm/templates/book/book.html:198 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:200 +#: bookwyrm/templates/book/book.html:217 msgid "Reviews" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:222 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:211 +#: bookwyrm/templates/book/book.html:228 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:234 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:253 +#: bookwyrm/templates/book/book.html:270 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:282 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 #: 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:68 +#: bookwyrm/templates/user/layout.html:75 msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:304 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:314 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -390,22 +420,22 @@ msgid "ISBN:" msgstr "" #: 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 "" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:253 +#: bookwyrm/templates/book/edit_book.html:309 msgid "ASIN:" msgstr "" #: 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 "" #: 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 "" @@ -420,127 +450,132 @@ msgstr "" msgid "Add Book" msgstr "" -#: bookwyrm/templates/book/edit_book.html:40 +#: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" msgstr "" -#: bookwyrm/templates/book/edit_book.html:47 +#: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" msgstr "" -#: bookwyrm/templates/book/edit_book.html:52 +#: bookwyrm/templates/book/edit_book.html:71 #, python-format msgid "Author of %(book_title)s" msgstr "" -#: bookwyrm/templates/book/edit_book.html:55 +#: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" msgstr "" -#: bookwyrm/templates/book/edit_book.html:61 +#: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit_book.html:67 +#: bookwyrm/templates/book/edit_book.html:89 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit_book.html:71 +#: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit_book.html:77 +#: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/edit_book.html:79 +#: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" msgstr "" -#: bookwyrm/templates/book/edit_book.html:93 +#: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:101 +#: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:114 +#: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:122 +#: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:130 +#: bookwyrm/templates/book/edit_book.html:160 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:139 +#: bookwyrm/templates/book/edit_book.html:169 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:148 +#: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:156 +#: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:165 +#: bookwyrm/templates/book/edit_book.html:195 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit_book.html:171 +#: bookwyrm/templates/book/edit_book.html:202 #, python-format -msgid "Remove %(name)s" +msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit_book.html:176 +#: bookwyrm/templates/book/edit_book.html:205 +#, python-format +msgid "Author page for %(name)s" +msgstr "" + +#: bookwyrm/templates/book/edit_book.html:212 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:177 +#: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" msgstr "" -#: bookwyrm/templates/book/edit_book.html:183 +#: bookwyrm/templates/book/edit_book.html:220 #: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit_book.html:211 +#: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit_book.html:212 +#: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:220 +#: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:227 +#: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit_book.html:228 +#: bookwyrm/templates/book/edit_book.html:269 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:233 +#: bookwyrm/templates/book/edit_book.html:277 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:238 +#: bookwyrm/templates/book/edit_book.html:285 msgid "Openlibrary ID:" msgstr "" @@ -602,11 +637,40 @@ msgstr "" msgid "rated it" msgstr "" +#: bookwyrm/templates/book/readthrough.html:8 +msgid "Progress Updates:" +msgstr "" + +#: bookwyrm/templates/book/readthrough.html:14 +msgid "finished" +msgstr "" + +#: bookwyrm/templates/book/readthrough.html:25 +msgid "Show all updates" +msgstr "" + +#: bookwyrm/templates/book/readthrough.html:41 +msgid "Delete this progress update" +msgstr "" + +#: bookwyrm/templates/book/readthrough.html:52 +msgid "started" +msgstr "" + +#: bookwyrm/templates/book/readthrough.html:59 +#: bookwyrm/templates/book/readthrough.html:73 +msgid "Edit read dates" +msgstr "" + +#: bookwyrm/templates/book/readthrough.html:63 +msgid "Delete these read dates" +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/feed/layout.html:71 +#: bookwyrm/templates/get_started/layout.html:20 +#: bookwyrm/templates/get_started/layout.html:53 #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" @@ -616,6 +680,52 @@ msgstr "" msgid "Compose status" msgstr "" +#: bookwyrm/templates/confirm_email/confirm_email.html:4 +msgid "Confirm email" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:7 +msgid "Confirm your email address" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:13 +msgid "A confirmation code has been sent to the email address you used to register your account." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:15 +msgid "Sorry! We couldn't find that code." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:19 +msgid "Confirmation code:" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:25 +#: bookwyrm/templates/discover/landing_layout.html:70 +#: bookwyrm/templates/moderation/report_modal.html:33 +msgid "Submit" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:32 +msgid "Can't find your code?" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:4 +msgid "Resend confirmation link" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:11 +#: 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/confirm_email/resend_form.html:17 +msgid "Resend link" +msgstr "" + #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" msgstr "" @@ -630,7 +740,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/layout.html:71 msgid "Directory" msgstr "" @@ -661,23 +771,30 @@ msgstr "" msgid "Recently active" msgstr "" -#: bookwyrm/templates/directory/user_card.html:33 +#: bookwyrm/templates/directory/user_card.html:17 +#: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/user/user_preview.html:16 +#: bookwyrm/templates/user/user_preview.html:17 +msgid "Locked account" +msgstr "" + +#: bookwyrm/templates/directory/user_card.html:40 msgid "follower you follow" msgid_plural "followers you follow" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/directory/user_card.html:40 +#: bookwyrm/templates/directory/user_card.html:47 msgid "book on your shelves" msgid_plural "books on your shelves" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/directory/user_card.html:48 +#: bookwyrm/templates/directory/user_card.html:55 msgid "posts" msgstr "" -#: bookwyrm/templates/directory/user_card.html:54 +#: bookwyrm/templates/directory/user_card.html:61 msgid "last active" msgstr "" @@ -713,7 +830,7 @@ msgid "Recent Books" msgstr "" #: bookwyrm/templates/discover/landing_layout.html:5 -#: bookwyrm/templates/get_started/layout.html:4 +#: bookwyrm/templates/get_started/layout.html:5 msgid "Welcome" msgstr "" @@ -735,7 +852,7 @@ msgid "Join %(name)s" msgstr "" #: bookwyrm/templates/discover/landing_layout.html:51 -#: bookwyrm/templates/login.html:51 +#: bookwyrm/templates/login.html:56 msgid "This instance is closed" msgstr "" @@ -747,22 +864,24 @@ msgstr "" 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:33 -msgid "Submit" -msgstr "" - #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" msgstr "" +#: bookwyrm/templates/email/confirm/html_content.html:6 +#: bookwyrm/templates/email/confirm/text_content.html:4 +#, python-format +msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:11 +msgid "Confirm Email" +msgstr "" + +#: bookwyrm/templates/email/confirm/subject.html:2 +msgid "Please confirm your email" +msgstr "" + #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," @@ -831,7 +950,7 @@ msgid "Direct Messages with %(username)s" msgstr "" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:99 msgid "Direct Messages" msgstr "" @@ -843,93 +962,54 @@ msgstr "" msgid "You have no messages right now." msgstr "" -#: bookwyrm/templates/feed/feed.html:8 -msgid "Home Timeline" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:10 -msgid "Local Timeline" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:12 -msgid "Federated Timeline" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:18 -msgid "Home" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:21 -msgid "Local" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:24 -#: bookwyrm/templates/settings/edit_server.html:40 -msgid "Federated" -msgstr "" - -#: bookwyrm/templates/feed/feed.html:32 +#: bookwyrm/templates/feed/feed.html:22 #, python-format -msgid "load 0 unread status(es)" +msgid "load 0 unread status(es)" msgstr "" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:38 msgid "There aren't any activities right now! Try following a user to get started" msgstr "" -#: bookwyrm/templates/feed/feed.html:55 -#: bookwyrm/templates/get_started/users.html:6 -msgid "Who to follow" -msgstr "" - -#: bookwyrm/templates/feed/feed_layout.html:4 +#: bookwyrm/templates/feed/layout.html:5 msgid "Updates" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:10 +#: bookwyrm/templates/feed/layout.html:12 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:12 +#: bookwyrm/templates/feed/layout.html:14 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/layout.html:25 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "To Read" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:24 +#: bookwyrm/templates/feed/layout.html:26 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Currently Reading" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:25 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 +#: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 +#: bookwyrm/templates/feed/layout.html:90 bookwyrm/templates/goal.html:26 #: bookwyrm/templates/snippets/goal_card.html:6 #, python-format 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/feed/suggested_users.html:3 +#: bookwyrm/templates/get_started/users.html:6 +msgid "Who to follow" +msgstr "" #: bookwyrm/templates/get_started/book_preview.html:6 #, python-format @@ -960,7 +1040,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:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45 #: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 @@ -986,33 +1066,33 @@ msgstr "" msgid "Save & continue" msgstr "" -#: bookwyrm/templates/get_started/layout.html:14 +#: bookwyrm/templates/get_started/layout.html:15 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/get_started/layout.html:16 +#: bookwyrm/templates/get_started/layout.html:17 msgid "These are some first steps to get you started." msgstr "" -#: bookwyrm/templates/get_started/layout.html:30 +#: bookwyrm/templates/get_started/layout.html:31 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" msgstr "" -#: bookwyrm/templates/get_started/layout.html:34 +#: bookwyrm/templates/get_started/layout.html:35 msgid "Add books" msgstr "" -#: bookwyrm/templates/get_started/layout.html:38 +#: bookwyrm/templates/get_started/layout.html:39 msgid "Find friends" msgstr "" -#: bookwyrm/templates/get_started/layout.html:44 +#: bookwyrm/templates/get_started/layout.html:45 msgid "Skip this step" msgstr "" -#: bookwyrm/templates/get_started/layout.html:48 +#: bookwyrm/templates/get_started/layout.html:49 msgid "Finish" msgstr "" @@ -1041,7 +1121,7 @@ msgid "Manually approve followers:" msgstr "" #: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:58 +#: bookwyrm/templates/preferences/edit_user.html:66 msgid "Show this account in suggested users:" msgstr "" @@ -1122,75 +1202,88 @@ msgstr "" msgid "No recent imports" msgstr "" -#: bookwyrm/templates/import_status.html:5 -#: bookwyrm/templates/import_status.html:9 +#: bookwyrm/templates/import_status.html:6 +#: bookwyrm/templates/import_status.html:10 msgid "Import Status" msgstr "" -#: bookwyrm/templates/import_status.html:12 +#: bookwyrm/templates/import_status.html:11 +msgid "Back to imports" +msgstr "" + +#: bookwyrm/templates/import_status.html:15 msgid "Import started:" msgstr "" -#: bookwyrm/templates/import_status.html:16 +#: bookwyrm/templates/import_status.html:20 msgid "Import completed:" msgstr "" -#: bookwyrm/templates/import_status.html:19 +#: bookwyrm/templates/import_status.html:25 msgid "TASK FAILED" msgstr "" -#: bookwyrm/templates/import_status.html:25 +#: bookwyrm/templates/import_status.html:32 msgid "Import still in progress." msgstr "" -#: bookwyrm/templates/import_status.html:27 +#: bookwyrm/templates/import_status.html:34 msgid "(Hit reload to update!)" msgstr "" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import_status.html:41 msgid "Failed to load" msgstr "" -#: bookwyrm/templates/import_status.html:43 +#: bookwyrm/templates/import_status.html:50 #, 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:78 +#: bookwyrm/templates/import_status.html:62 +#, python-format +msgid "Line %(index)s: %(title)s by %(author)s" +msgstr "" + +#: bookwyrm/templates/import_status.html:82 msgid "Select all" msgstr "" -#: bookwyrm/templates/import_status.html:81 +#: bookwyrm/templates/import_status.html:85 msgid "Retry items" msgstr "" -#: bookwyrm/templates/import_status.html:107 +#: bookwyrm/templates/import_status.html:112 msgid "Successfully imported" msgstr "" -#: bookwyrm/templates/import_status.html:111 +#: bookwyrm/templates/import_status.html:114 +msgid "Import Progress" +msgstr "" + +#: bookwyrm/templates/import_status.html:119 msgid "Book" msgstr "" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import_status.html:122 #: 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 "" -#: bookwyrm/templates/import_status.html:117 +#: bookwyrm/templates/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" msgstr "" -#: bookwyrm/templates/import_status.html:140 +#: bookwyrm/templates/import_status.html:148 msgid "Imported" msgstr "" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 -#: bookwyrm/templates/login.html:46 +#: bookwyrm/templates/login.html:51 msgid "Create an Account" msgstr "" @@ -1215,27 +1308,27 @@ msgstr "" msgid "Matching Books" msgstr "" -#: bookwyrm/templates/layout.html:33 +#: bookwyrm/templates/layout.html:40 msgid "Search for a book or user" msgstr "" -#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 +#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 msgid "Main navigation menu" msgstr "" -#: bookwyrm/templates/layout.html:58 +#: bookwyrm/templates/layout.html:65 msgid "Feed" msgstr "" -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:94 msgid "Your Books" msgstr "" -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/layout.html:104 msgid "Settings" msgstr "" -#: bookwyrm/templates/layout.html:106 +#: bookwyrm/templates/layout.html:113 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1243,61 +1336,61 @@ msgstr "" msgid "Invites" msgstr "" -#: bookwyrm/templates/layout.html:113 +#: bookwyrm/templates/layout.html:120 msgid "Admin" msgstr "" -#: bookwyrm/templates/layout.html:120 +#: bookwyrm/templates/layout.html:127 msgid "Log out" msgstr "" -#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 +#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "" -#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 -#: bookwyrm/templates/login.html:17 +#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162 +#: bookwyrm/templates/login.html:22 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "" -#: bookwyrm/templates/layout.html:156 +#: bookwyrm/templates/layout.html:163 msgid "password" msgstr "" -#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41 msgid "Forgot your password?" msgstr "" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 -#: bookwyrm/templates/login.html:33 +#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/login.html:38 msgid "Log in" msgstr "" -#: bookwyrm/templates/layout.html:168 +#: bookwyrm/templates/layout.html:175 msgid "Join" msgstr "" -#: bookwyrm/templates/layout.html:206 +#: bookwyrm/templates/layout.html:213 msgid "About this instance" msgstr "" -#: bookwyrm/templates/layout.html:210 +#: bookwyrm/templates/layout.html:217 msgid "Contact site admin" msgstr "" -#: bookwyrm/templates/layout.html:214 +#: bookwyrm/templates/layout.html:221 msgid "Documentation" msgstr "" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:228 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "" -#: bookwyrm/templates/layout.html:225 +#: bookwyrm/templates/layout.html:232 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "" @@ -1448,16 +1541,20 @@ msgstr "" msgid "Login" msgstr "" -#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 +#: bookwyrm/templates/login.html:16 +msgid "Success! Email address confirmed." +msgstr "" + +#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" msgstr "" -#: bookwyrm/templates/login.html:52 +#: bookwyrm/templates/login.html:57 msgid "Contact an administrator to get an invite" msgstr "" -#: bookwyrm/templates/login.html:63 +#: bookwyrm/templates/login.html:68 msgid "More about this site" msgstr "" @@ -1675,6 +1772,7 @@ msgstr "" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "" @@ -1688,7 +1786,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/preferences_layout.html:26 +#: bookwyrm/templates/preferences/layout.html:30 msgid "Blocked Users" msgstr "" @@ -1699,7 +1797,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:19 +#: bookwyrm/templates/preferences/layout.html:19 msgid "Change Password" msgstr "" @@ -1707,6 +1805,21 @@ msgstr "" msgid "New password:" msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:4 +#: bookwyrm/templates/preferences/delete_user.html:7 +#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/layout.html:23 +msgid "Delete Account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Permanently delete account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:14 +msgid "Deleting your account cannot be undone. The username will not be available to register in the future." +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" @@ -1716,44 +1829,63 @@ msgstr "" msgid "Show set reading goal prompt in feed:" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:62 +#: bookwyrm/templates/preferences/edit_user.html:58 +msgid "Default post privacy:" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:70 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:65 +#: bookwyrm/templates/preferences/edit_user.html:73 msgid "Preferred Timezone: " msgstr "" -#: bookwyrm/templates/preferences/preferences_layout.html:11 +#: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "" -#: bookwyrm/templates/preferences/preferences_layout.html:15 +#: bookwyrm/templates/preferences/layout.html:15 msgid "Profile" msgstr "" -#: bookwyrm/templates/preferences/preferences_layout.html:22 +#: bookwyrm/templates/preferences/layout.html:26 msgid "Relationships" msgstr "" +#: bookwyrm/templates/reading_progress/finish.html:5 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/reading_progress/start.html:5 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/reading_progress/want.html:5 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "" + #: bookwyrm/templates/rss/title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 +#: bookwyrm/templates/snippets/status/status_header.html:36 msgid "rated" msgstr "" #: bookwyrm/templates/rss/title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 +#: bookwyrm/templates/snippets/status/status_header.html:38 msgid "reviewed" msgstr "" #: bookwyrm/templates/rss/title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 +#: bookwyrm/templates/snippets/status/status_header.html:40 msgid "commented on" msgstr "" #: bookwyrm/templates/rss/title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 +#: bookwyrm/templates/snippets/status/status_header.html:42 msgid "quoted" msgstr "" @@ -1777,12 +1909,6 @@ msgstr "" msgid "Search type" msgstr "" -#: bookwyrm/templates/search/layout.html:21 -#: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:74 -msgid "Books" -msgstr "" - #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 #: bookwyrm/templates/settings/admin_layout.html:26 @@ -1958,6 +2084,10 @@ msgstr "" msgid "Status:" msgstr "" +#: bookwyrm/templates/settings/edit_server.html:40 +msgid "Federated" +msgstr "" + #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 msgid "Blocked" @@ -1984,7 +2114,7 @@ msgid "Details" msgstr "" #: bookwyrm/templates/settings/federated_server.html:39 -#: bookwyrm/templates/user/layout.html:56 +#: bookwyrm/templates/user/layout.html:63 msgid "Activity" msgstr "" @@ -2023,7 +2153,7 @@ msgid "Edit" msgstr "" #: bookwyrm/templates/settings/federated_server.html:105 -#: bookwyrm/templates/user_admin/user_moderation_actions.html:3 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:8 msgid "Actions" msgstr "" @@ -2229,15 +2359,23 @@ msgstr "" msgid "Additional info:" msgstr "" -#: bookwyrm/templates/settings/site.html:83 -msgid "Allow registration:" -msgstr "" - -#: bookwyrm/templates/settings/site.html:87 -msgid "Allow invite requests:" +#: bookwyrm/templates/settings/site.html:85 +msgid "Allow registration" msgstr "" #: bookwyrm/templates/settings/site.html:91 +msgid "Allow invite requests" +msgstr "" + +#: bookwyrm/templates/settings/site.html:97 +msgid "Require users to confirm email address" +msgstr "" + +#: bookwyrm/templates/settings/site.html:99 +msgid "(Recommended if registration is open)" +msgstr "" + +#: bookwyrm/templates/settings/site.html:102 msgid "Registration closed text:" msgstr "" @@ -2246,13 +2384,20 @@ msgstr "" msgid "Posted by %(username)s" msgstr "" -#: bookwyrm/templates/snippets/book_cover.html:31 +#: bookwyrm/templates/snippets/authors.html:22 +#, python-format +msgid "and %(remainder_count_display)s other" +msgid_plural "and %(remainder_count_display)s others" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/book_cover.html:32 msgid "No cover" msgstr "" -#: bookwyrm/templates/snippets/book_titleby.html:4 +#: bookwyrm/templates/snippets/book_titleby.html:6 #, python-format -msgid "%(title)s by " +msgid "%(title)s by" msgstr "" #: bookwyrm/templates/snippets/boost_button.html:20 @@ -2334,7 +2479,7 @@ 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 +#: bookwyrm/templates/snippets/privacy_select.html:20 msgid "Private" msgstr "" @@ -2451,7 +2596,7 @@ 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/start_reading_modal.html:31 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" msgstr "" @@ -2495,13 +2640,13 @@ msgstr "" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 -#: bookwyrm/templates/snippets/privacy_select.html:10 +#: bookwyrm/templates/snippets/privacy_select.html:11 msgid "Public" msgstr "" #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 -#: bookwyrm/templates/snippets/privacy_select.html:13 +#: bookwyrm/templates/snippets/privacy_select.html:14 msgid "Unlisted" msgstr "" @@ -2513,7 +2658,7 @@ msgstr "" msgid "Post privacy" msgstr "" -#: bookwyrm/templates/snippets/privacy_select.html:16 +#: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" @@ -2527,38 +2672,9 @@ msgstr "" msgid "Rate" msgstr "" -#: bookwyrm/templates/snippets/readthrough.html:8 -msgid "Progress Updates:" -msgstr "" - -#: bookwyrm/templates/snippets/readthrough.html:14 -msgid "finished" -msgstr "" - -#: bookwyrm/templates/snippets/readthrough.html:25 -msgid "Show all updates" -msgstr "" - -#: bookwyrm/templates/snippets/readthrough.html:41 -msgid "Delete this progress update" -msgstr "" - -#: bookwyrm/templates/snippets/readthrough.html:52 -msgid "started" -msgstr "" - -#: bookwyrm/templates/snippets/readthrough.html:59 -#: bookwyrm/templates/snippets/readthrough.html:73 -msgid "Edit read dates" -msgstr "" - -#: bookwyrm/templates/snippets/readthrough.html:63 -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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "" @@ -2593,7 +2709,7 @@ msgid "Finish \"%(book_title)s\"" msgstr "" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 msgid "Update progress" msgstr "" @@ -2601,20 +2717,20 @@ msgstr "" msgid "More shelves" msgstr "" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11 msgid "Start reading" msgstr "" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19 msgid "Finish reading" msgstr "" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 #: 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:47 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57 #, python-format msgid "Remove from %(name)s" msgstr "" @@ -2629,17 +2745,17 @@ msgstr "" msgid "Want to Read \"%(book_title)s\"" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:71 +#: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:86 +#: bookwyrm/templates/snippets/status/content_status.html:87 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:117 msgid "Open image in new window" msgstr "" @@ -2662,7 +2778,7 @@ msgstr "" msgid "boosted" msgstr "" -#: bookwyrm/templates/snippets/status/status_header.html:45 +#: bookwyrm/templates/snippets/status/status_header.html:46 #, python-format msgid "replied to %(username)s's status" msgstr "" @@ -2678,10 +2794,29 @@ 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 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:12 msgid "Send direct message" msgstr "" +#: bookwyrm/templates/snippets/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/snippets/suggested_users.html:23 +#, 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/snippets/suggested_users.html:31 +#: bookwyrm/templates/user/user_preview.html:36 +msgid "Follows you" +msgstr "" + #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" msgstr "" @@ -2694,15 +2829,15 @@ msgstr "" msgid "Sorted descending" msgstr "" -#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 +#: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "" -#: bookwyrm/templates/user/layout.html:37 +#: bookwyrm/templates/user/layout.html:44 msgid "Follow Requests" msgstr "" -#: bookwyrm/templates/user/layout.html:62 +#: bookwyrm/templates/user/layout.html:69 msgid "Reading Goal" msgstr "" @@ -2808,30 +2943,34 @@ msgstr "" msgid "No activities yet!" msgstr "" -#: bookwyrm/templates/user/user_preview.html:15 +#: bookwyrm/templates/user/user_preview.html:22 #, python-format msgid "Joined %(date)s" msgstr "" -#: bookwyrm/templates/user/user_preview.html:19 +#: bookwyrm/templates/user/user_preview.html:26 #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/user/user_preview.html:20 +#: bookwyrm/templates/user/user_preview.html:27 #, python-format msgid "%(counter)s following" msgstr "" -#: bookwyrm/templates/user/user_preview.html:26 +#: bookwyrm/templates/user/user_preview.html:34 #, python-format msgid "%(mutuals_display)s follower you follow" msgid_plural "%(mutuals_display)s followers you follow" msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/user/user_preview.html:38 +msgid "No followers you follow" +msgstr "" + #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" msgstr "" @@ -2887,22 +3026,35 @@ msgstr "" msgid "View instance" msgstr "" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:11 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:5 +msgid "Permanently deleted" +msgstr "" + +#: bookwyrm/templates/user_admin/user_moderation_actions.html:17 msgid "Suspend user" msgstr "" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:13 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:19 msgid "Un-suspend user" msgstr "" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:21 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:28 msgid "Access level:" msgstr "" -#: 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 "" +#: bookwyrm/templatetags/utilities.py:30 +#, python-format +msgid "%(title)s: %(subtitle)s" +msgstr "" + +#: bookwyrm/views/authentication.py:69 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index 54adfb570..23869cf45 100644 Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index c9a19a4df..9fc28535e 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-06 20:52+0000\n" +"POT-Creation-Date: 2021-08-07 01:35+0000\n" "PO-Revision-Date: 2021-03-19 11:49+0800\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,99 +18,125 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:224 +#: 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:238 +#: bookwyrm/forms.py:246 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:239 +#: bookwyrm/forms.py:247 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:240 +#: bookwyrm/forms.py:248 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:241 +#: bookwyrm/forms.py:249 msgid "Does Not Expire" msgstr "Nunca se vence" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:254 #, python-format msgid "%(count)d uses" msgstr "%(count)d usos" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:257 msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms.py:299 +#: bookwyrm/forms.py:307 msgid "List Order" msgstr "Orden de la lista" -#: bookwyrm/forms.py:300 +#: bookwyrm/forms.py:308 msgid "Book Title" msgstr "Título" -#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 +#: bookwyrm/forms.py:309 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 "Calificación" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:315 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:316 msgid "Descending" msgstr "Descendente" -#: bookwyrm/models/fields.py:25 +#: bookwyrm/models/fields.py:27 #, 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:43 +#: bookwyrm/models/fields.py:36 bookwyrm/models/fields.py:45 #, python-format msgid "%(value)s is not a valid username" msgstr "%(value)s no es un usuario válido" -#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 +#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159 msgid "username" msgstr "nombre de usuario" -#: bookwyrm/models/fields.py:171 +#: bookwyrm/models/fields.py:179 msgid "A user with that username already exists." msgstr "Ya existe un usuario con ese nombre." -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:123 +msgid "Home Timeline" +msgstr "Línea temporal de hogar" + +#: bookwyrm/settings.py:123 +msgid "Home" +msgstr "Hogar" + +#: bookwyrm/settings.py:124 +#, fuzzy +#| msgid "Book Title" +msgid "Books Timeline" +msgstr "Título" + +#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/templates/search/layout.html:42 +#: bookwyrm/templates/user/layout.html:81 +msgid "Books" +msgstr "Libros" + +#: bookwyrm/settings.py:170 msgid "English" msgstr "Inglés" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:171 msgid "German" msgstr "Aléman" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:172 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:173 msgid "French" msgstr "Francés" -#: bookwyrm/settings.py:160 +#: bookwyrm/settings.py:174 msgid "Simplified Chinese" msgstr "Chino simplificado" +#: bookwyrm/settings.py:175 +#, fuzzy +#| msgid "Additional info:" +msgid "Traditional Chinese" +msgstr "Más informacion:" + #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" msgstr "No encontrado" @@ -136,34 +162,44 @@ msgstr "¡Algo salió mal! Disculpa." msgid "Edit Author" msgstr "Editar Autor/Autora" -#: bookwyrm/templates/author/author.html:32 -#: bookwyrm/templates/author/edit_author.html:38 +#: bookwyrm/templates/author/author.html:34 +#: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" msgstr "Aliases:" -#: bookwyrm/templates/author/author.html:38 +#: bookwyrm/templates/author/author.html:45 msgid "Born:" msgstr "Nacido:" -#: bookwyrm/templates/author/author.html:44 +#: bookwyrm/templates/author/author.html:52 msgid "Died:" msgstr "Muerto:" -#: bookwyrm/templates/author/author.html:51 +#: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:55 -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/author/author.html:69 +#: bookwyrm/templates/book/book.html:95 msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" -#: bookwyrm/templates/author/author.html:60 -#: bookwyrm/templates/book/book.html:81 +#: bookwyrm/templates/author/author.html:77 +#: bookwyrm/templates/book/book.html:98 msgid "View on Inventaire" msgstr "Ver en Inventaire" -#: bookwyrm/templates/author/author.html:74 +#: bookwyrm/templates/author/author.html:85 +#, fuzzy +#| msgid "View on OpenLibrary" +msgid "View on LibraryThing" +msgstr "Ver en OpenLibrary" + +#: bookwyrm/templates/author/author.html:93 +msgid "View on Goodreads" +msgstr "" + +#: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" msgstr "Libros de %(name)s" @@ -173,213 +209,213 @@ msgid "Edit Author:" msgstr "Editar Autor/Autora/Autore:" #: bookwyrm/templates/author/edit_author.html:13 -#: bookwyrm/templates/book/edit_book.html:18 +#: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" msgstr "Agregado:" #: bookwyrm/templates/author/edit_author.html:14 -#: bookwyrm/templates/book/edit_book.html:19 +#: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" msgstr "Actualizado:" #: 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 "Editado más recientemente por:" #: bookwyrm/templates/author/edit_author.html:31 -#: bookwyrm/templates/book/edit_book.html:90 +#: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" msgstr "Metadatos" -#: 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 "Nombre:" -#: 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 "Separar varios valores con comas." -#: 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 "Enlace de Wikipedia:" -#: bookwyrm/templates/author/edit_author.html:57 +#: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" msgstr "Fecha de nacimiento:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" msgstr "Fecha de muerte:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" msgstr "Identificadores de autor/autora" -#: bookwyrm/templates/author/edit_author.html:74 +#: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" msgstr "Clave 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 "ID Inventaire:" -#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "Clave Librarything:" -#: bookwyrm/templates/author/edit_author.html:89 +#: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" msgstr "Clave Goodreads:" -#: bookwyrm/templates/author/edit_author.html:98 -#: bookwyrm/templates/book/book.html:124 -#: bookwyrm/templates/book/edit_book.html:263 +#: bookwyrm/templates/author/edit_author.html:116 +#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/edit_book.html:321 +#: bookwyrm/templates/book/readthrough.html:77 #: bookwyrm/templates/lists/form.html:42 -#: bookwyrm/templates/preferences/edit_user.html:70 +#: bookwyrm/templates/preferences/edit_user.html:78 #: 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/snippets/readthrough.html:77 +#: bookwyrm/templates/settings/site.html:108 #: 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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "Guardar" -#: bookwyrm/templates/author/edit_author.html:99 -#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 +#: bookwyrm/templates/author/edit_author.html:117 +#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:264 +#: bookwyrm/templates/book/edit_book.html:322 +#: bookwyrm/templates/book/readthrough.html:78 #: bookwyrm/templates/moderation/report_modal.html:34 #: 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 #: 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/start_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" msgstr "Cancelar" -#: bookwyrm/templates/book/book.html:31 +#: bookwyrm/templates/book/book.html:48 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" msgstr "por" -#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 +#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 msgid "Edit Book" msgstr "Editar Libro" -#: bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:74 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "Agregar portada" -#: bookwyrm/templates/book/book.html:61 +#: bookwyrm/templates/book/book.html:78 msgid "Failed to load cover" msgstr "No se pudo cargar la portada" -#: bookwyrm/templates/book/book.html:101 +#: bookwyrm/templates/book/book.html:118 #, 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:113 +#: bookwyrm/templates/book/book.html:130 msgid "Add Description" msgstr "Agregar descripción" -#: bookwyrm/templates/book/book.html:120 -#: bookwyrm/templates/book/edit_book.html:108 +#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Descripción:" -#: bookwyrm/templates/book/book.html:134 +#: bookwyrm/templates/book/book.html:151 #, python-format msgid "%(count)s editions" msgstr "%(count)s ediciones" -#: bookwyrm/templates/book/book.html:142 +#: bookwyrm/templates/book/book.html:159 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "Esta edición está en tu %(shelf_name)s estante." -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:165 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Una edición diferente de este libro está en tu %(shelf_name)s estante." -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:176 msgid "Your reading activity" msgstr "Tu actividad de lectura" -#: bookwyrm/templates/book/book.html:162 +#: bookwyrm/templates/book/book.html:179 msgid "Add read dates" msgstr "Agregar fechas de lectura" -#: bookwyrm/templates/book/book.html:171 +#: bookwyrm/templates/book/book.html:188 msgid "Create" msgstr "Crear" -#: bookwyrm/templates/book/book.html:181 +#: bookwyrm/templates/book/book.html:198 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 +#: bookwyrm/templates/book/book.html:217 msgid "Reviews" msgstr "Reseñas" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:222 msgid "Your reviews" msgstr "Tus reseñas" -#: bookwyrm/templates/book/book.html:211 +#: bookwyrm/templates/book/book.html:228 msgid "Your comments" msgstr "Tus comentarios" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:234 msgid "Your quotes" msgstr "Tus citas" -#: bookwyrm/templates/book/book.html:253 +#: bookwyrm/templates/book/book.html:270 msgid "Subjects" msgstr "Sujetos" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:282 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 #: 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:68 +#: bookwyrm/templates/user/layout.html:75 msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:304 msgid "Add to list" msgstr "Agregar a lista" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:314 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -390,22 +426,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 "Número 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 "Subir portada:" #: 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 "Agregar portada de url:" @@ -420,127 +456,134 @@ msgstr "Editar \"%(book_title)s\"" msgid "Add Book" msgstr "Agregar libro" -#: bookwyrm/templates/book/edit_book.html:40 +#: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" msgstr "Confirmar información de libro" -#: bookwyrm/templates/book/edit_book.html:47 +#: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" msgstr "¿Es \"%(name)s\" un autor ya existente?" -#: bookwyrm/templates/book/edit_book.html:52 +#: bookwyrm/templates/book/edit_book.html:71 #, python-format msgid "Author of %(book_title)s" msgstr "Autor de %(book_title)s" -#: bookwyrm/templates/book/edit_book.html:55 +#: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" msgstr "Este es un autor nuevo" -#: bookwyrm/templates/book/edit_book.html:61 +#: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" msgstr "Creando un autor nuevo: %(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 "¿Es esta una edición de una obra ya existente?" -#: bookwyrm/templates/book/edit_book.html:71 +#: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" msgstr "Esta es una obra nueva" -#: bookwyrm/templates/book/edit_book.html:77 +#: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" msgstr "Confirmar" -#: bookwyrm/templates/book/edit_book.html:79 +#: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" msgstr "Volver" -#: bookwyrm/templates/book/edit_book.html:93 +#: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" msgstr "Título:" -#: bookwyrm/templates/book/edit_book.html:101 +#: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit_book.html:114 +#: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" msgstr "Serie:" -#: bookwyrm/templates/book/edit_book.html:122 +#: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" msgstr "Número de serie:" -#: bookwyrm/templates/book/edit_book.html:130 +#: bookwyrm/templates/book/edit_book.html:160 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit_book.html:139 +#: bookwyrm/templates/book/edit_book.html:169 msgid "Publisher:" msgstr "Editorial:" -#: bookwyrm/templates/book/edit_book.html:148 +#: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" msgstr "Fecha de primera publicación:" -#: bookwyrm/templates/book/edit_book.html:156 +#: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" msgstr "Fecha de publicación:" -#: bookwyrm/templates/book/edit_book.html:165 +#: bookwyrm/templates/book/edit_book.html:195 msgid "Authors" msgstr "Autores" -#: bookwyrm/templates/book/edit_book.html:171 -#, python-format -msgid "Remove %(name)s" -msgstr "Eliminar %(name)s" +#: bookwyrm/templates/book/edit_book.html:202 +#, fuzzy, python-format +#| msgid "Remove from %(name)s" +msgid "Remove %(name)s" +msgstr "Quitar de %(name)s" -#: bookwyrm/templates/book/edit_book.html:176 +#: bookwyrm/templates/book/edit_book.html:205 +#, fuzzy, python-format +#| msgid "Remove from %(name)s" +msgid "Author page for %(name)s" +msgstr "Quitar de %(name)s" + +#: bookwyrm/templates/book/edit_book.html:212 msgid "Add Authors:" msgstr "Agregar Autores:" -#: bookwyrm/templates/book/edit_book.html:177 +#: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" msgstr "Juan Nadie, Natalia Natalia" -#: bookwyrm/templates/book/edit_book.html:183 +#: bookwyrm/templates/book/edit_book.html:220 #: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" msgstr "Portada:" -#: bookwyrm/templates/book/edit_book.html:211 +#: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" msgstr "Propiedades físicas:" -#: bookwyrm/templates/book/edit_book.html:212 +#: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit_book.html:220 +#: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" msgstr "Páginas:" -#: bookwyrm/templates/book/edit_book.html:227 +#: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" msgstr "Identificadores de libro" -#: 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 "ID OpenLibrary:" @@ -602,11 +645,40 @@ msgstr "Publicado por %(publisher)s." msgid "rated it" msgstr "lo calificó con" +#: bookwyrm/templates/book/readthrough.html:8 +msgid "Progress Updates:" +msgstr "Actualizaciones de progreso:" + +#: bookwyrm/templates/book/readthrough.html:14 +msgid "finished" +msgstr "terminado" + +#: bookwyrm/templates/book/readthrough.html:25 +msgid "Show all updates" +msgstr "Mostrar todas las actualizaciones" + +#: bookwyrm/templates/book/readthrough.html:41 +msgid "Delete this progress update" +msgstr "Eliminar esta actualización de progreso" + +#: bookwyrm/templates/book/readthrough.html:52 +msgid "started" +msgstr "empezado" + +#: bookwyrm/templates/book/readthrough.html:59 +#: bookwyrm/templates/book/readthrough.html:73 +msgid "Edit read dates" +msgstr "Editar fechas de lectura" + +#: bookwyrm/templates/book/readthrough.html:63 +msgid "Delete these read dates" +msgstr "Eliminar estas fechas de lectura" + #: 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/feed/layout.html:71 +#: bookwyrm/templates/get_started/layout.html:20 +#: bookwyrm/templates/get_started/layout.html:53 #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" @@ -616,6 +688,60 @@ msgstr "Cerrar" msgid "Compose status" msgstr "Componer status" +#: bookwyrm/templates/confirm_email/confirm_email.html:4 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm email" +msgstr "Confirmar" + +#: bookwyrm/templates/confirm_email/confirm_email.html:7 +#, fuzzy +#| msgid "Enter a valid email address." +msgid "Confirm your email address" +msgstr "Ingrese una dirección de correo electrónico válida." + +#: bookwyrm/templates/confirm_email/confirm_email.html:13 +msgid "A confirmation code has been sent to the email address you used to register your account." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:15 +msgid "Sorry! We couldn't find that code." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:19 +#, fuzzy +#| msgid "Confirm password:" +msgid "Confirmation code:" +msgstr "Confirmar contraseña:" + +#: bookwyrm/templates/confirm_email/confirm_email.html:25 +#: bookwyrm/templates/discover/landing_layout.html:70 +#: bookwyrm/templates/moderation/report_modal.html:33 +msgid "Submit" +msgstr "Enviar" + +#: bookwyrm/templates/confirm_email/confirm_email.html:32 +msgid "Can't find your code?" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:4 +msgid "Resend confirmation link" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:11 +#: 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/confirm_email/resend_form.html:17 +#, fuzzy +#| msgid "Re-send invite" +msgid "Resend link" +msgstr "Re-enviar invitación" + #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" msgstr "Comunidad" @@ -630,7 +756,7 @@ msgstr "Comunidad federalizada" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/layout.html:71 msgid "Directory" msgstr "Directorio" @@ -661,23 +787,32 @@ msgstr "Sugerido" msgid "Recently active" msgstr "Activ@ recientemente" -#: bookwyrm/templates/directory/user_card.html:33 +#: bookwyrm/templates/directory/user_card.html:17 +#: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/user/user_preview.html:16 +#: bookwyrm/templates/user/user_preview.html:17 +#, fuzzy +#| msgid "Your Account" +msgid "Locked account" +msgstr "Tu cuenta" + +#: bookwyrm/templates/directory/user_card.html:40 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:40 +#: bookwyrm/templates/directory/user_card.html:47 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:48 +#: bookwyrm/templates/directory/user_card.html:55 msgid "posts" msgstr "publicaciones" -#: bookwyrm/templates/directory/user_card.html:54 +#: bookwyrm/templates/directory/user_card.html:61 msgid "last active" msgstr "actividad reciente" @@ -713,7 +848,7 @@ msgid "Recent Books" msgstr "Libros recientes" #: bookwyrm/templates/discover/landing_layout.html:5 -#: bookwyrm/templates/get_started/layout.html:4 +#: bookwyrm/templates/get_started/layout.html:5 msgid "Welcome" msgstr "Bienvenidos" @@ -735,7 +870,7 @@ msgid "Join %(name)s" msgstr "Unirse con %(name)s" #: bookwyrm/templates/discover/landing_layout.html:51 -#: bookwyrm/templates/login.html:51 +#: bookwyrm/templates/login.html:56 msgid "This instance is closed" msgstr "Esta instancia está cerrada." @@ -747,22 +882,26 @@ msgstr "¡Gracias! Tu solicitud ha sido recibido." msgid "Request an Invitation" msgstr "Solicitar una invitación" -#: 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:33 -msgid "Submit" -msgstr "Enviar" - #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" msgstr "Tu cuenta" +#: bookwyrm/templates/email/confirm/html_content.html:6 +#: bookwyrm/templates/email/confirm/text_content.html:4 +#, python-format +msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:11 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm Email" +msgstr "Confirmar" + +#: bookwyrm/templates/email/confirm/subject.html:2 +msgid "Please confirm your email" +msgstr "" + #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," @@ -831,7 +970,7 @@ msgid "Direct Messages with %(username)s" msgstr "Mensajes directos con %(username)s" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:99 msgid "Direct Messages" msgstr "Mensajes directos" @@ -843,93 +982,55 @@ 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:8 -msgid "Home Timeline" -msgstr "Línea temporal de hogar" - -#: bookwyrm/templates/feed/feed.html:10 -msgid "Local Timeline" -msgstr "Línea temporal local" - -#: bookwyrm/templates/feed/feed.html:12 -msgid "Federated Timeline" -msgstr "Línea temporal federalizado" - -#: bookwyrm/templates/feed/feed.html:18 -msgid "Home" -msgstr "Hogar" - -#: bookwyrm/templates/feed/feed.html:21 -msgid "Local" -msgstr "Local" - -#: bookwyrm/templates/feed/feed.html:24 -#: bookwyrm/templates/settings/edit_server.html:40 -msgid "Federated" -msgstr "Federalizado" - -#: bookwyrm/templates/feed/feed.html:32 -#, python-format -msgid "load 0 unread status(es)" +#: bookwyrm/templates/feed/feed.html:22 +#, fuzzy, python-format +#| msgid "load 0 unread status(es)" +msgid "load 0 unread status(es)" msgstr "cargar 0 status(es) no leídos" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:38 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:55 -#: bookwyrm/templates/get_started/users.html:6 -msgid "Who to follow" -msgstr "A quién seguir" - -#: bookwyrm/templates/feed/feed_layout.html:4 +#: bookwyrm/templates/feed/layout.html:5 msgid "Updates" msgstr "Actualizaciones" -#: bookwyrm/templates/feed/feed_layout.html:10 +#: bookwyrm/templates/feed/layout.html:12 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "Tus libros" -#: bookwyrm/templates/feed/feed_layout.html:12 +#: bookwyrm/templates/feed/layout.html:14 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/layout.html:25 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "To Read" msgstr "Para leer" -#: bookwyrm/templates/feed/feed_layout.html:24 +#: bookwyrm/templates/feed/layout.html:26 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Currently Reading" msgstr "Leyendo actualmente" -#: bookwyrm/templates/feed/feed_layout.html:25 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 +#: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" msgstr "Leido" -#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 +#: bookwyrm/templates/feed/layout.html:90 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/suggested_users.html:16 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -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] "%(shared_books)s libro en tus estantes" -msgstr[1] "%(shared_books)s libros en tus estantes" +#: bookwyrm/templates/feed/suggested_users.html:3 +#: bookwyrm/templates/get_started/users.html:6 +msgid "Who to follow" +msgstr "A quién seguir" #: bookwyrm/templates/get_started/book_preview.html:6 #, python-format @@ -960,7 +1061,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:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45 #: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 @@ -986,33 +1087,33 @@ msgstr "No se encontró ningún libro" msgid "Save & continue" msgstr "Guardar & continuar" -#: bookwyrm/templates/get_started/layout.html:14 +#: bookwyrm/templates/get_started/layout.html:15 #, python-format msgid "Welcome to %(site_name)s!" msgstr "¡Bienvenido a %(site_name)s!" -#: bookwyrm/templates/get_started/layout.html:16 +#: bookwyrm/templates/get_started/layout.html:17 msgid "These are some first steps to get you started." msgstr "Estos son unos primeros pasos para empezar." -#: bookwyrm/templates/get_started/layout.html:30 +#: bookwyrm/templates/get_started/layout.html:31 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" msgstr "Crear tu perfil" -#: bookwyrm/templates/get_started/layout.html:34 +#: bookwyrm/templates/get_started/layout.html:35 msgid "Add books" msgstr "Agregar libros" -#: bookwyrm/templates/get_started/layout.html:38 +#: bookwyrm/templates/get_started/layout.html:39 msgid "Find friends" msgstr "Encontrar amigos" -#: bookwyrm/templates/get_started/layout.html:44 +#: bookwyrm/templates/get_started/layout.html:45 msgid "Skip this step" msgstr "Saltar este paso" -#: bookwyrm/templates/get_started/layout.html:48 +#: bookwyrm/templates/get_started/layout.html:49 msgid "Finish" msgstr "Terminar" @@ -1041,7 +1142,7 @@ msgid "Manually approve followers:" msgstr "Aprobar seguidores a mano:" #: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:58 +#: bookwyrm/templates/preferences/edit_user.html:66 msgid "Show this account in suggested users:" msgstr "Mostrar esta cuenta en los usuarios sugeridos:" @@ -1122,75 +1223,92 @@ msgstr "Importaciones recientes" msgid "No recent imports" msgstr "No hay ninguna importación reciente" -#: bookwyrm/templates/import_status.html:5 -#: bookwyrm/templates/import_status.html:9 +#: 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:12 +#: bookwyrm/templates/import_status.html:11 +#, fuzzy +#| msgid "Back to reports" +msgid "Back to imports" +msgstr "Volver a los informes" + +#: bookwyrm/templates/import_status.html:15 msgid "Import started:" msgstr "Importación ha empezado:" -#: bookwyrm/templates/import_status.html:16 +#: bookwyrm/templates/import_status.html:20 msgid "Import completed:" msgstr "Importación ha terminado:" -#: bookwyrm/templates/import_status.html:19 +#: bookwyrm/templates/import_status.html:25 msgid "TASK FAILED" msgstr "TAREA FALLÓ" -#: bookwyrm/templates/import_status.html:25 +#: bookwyrm/templates/import_status.html:32 msgid "Import still in progress." msgstr "Importación todavia en progreso" -#: bookwyrm/templates/import_status.html:27 +#: bookwyrm/templates/import_status.html:34 msgid "(Hit reload to update!)" msgstr "(¡Refresca para actualizar!)" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import_status.html:41 msgid "Failed to load" msgstr "No se pudo cargar" -#: bookwyrm/templates/import_status.html:43 +#: bookwyrm/templates/import_status.html:50 #, 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:78 +#: bookwyrm/templates/import_status.html:62 +#, python-format +msgid "Line %(index)s: %(title)s by %(author)s" +msgstr "" + +#: bookwyrm/templates/import_status.html:82 msgid "Select all" msgstr "Seleccionar todo" -#: bookwyrm/templates/import_status.html:81 +#: bookwyrm/templates/import_status.html:85 msgid "Retry items" msgstr "Reintentar ítems" -#: bookwyrm/templates/import_status.html:107 +#: bookwyrm/templates/import_status.html:112 msgid "Successfully imported" msgstr "Importado exitosamente" -#: bookwyrm/templates/import_status.html:111 +#: bookwyrm/templates/import_status.html:114 +#, fuzzy +#| msgid "Import still in progress." +msgid "Import Progress" +msgstr "Importación todavia en progreso" + +#: bookwyrm/templates/import_status.html:119 msgid "Book" msgstr "Libro" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import_status.html:122 #: 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 "Título" -#: bookwyrm/templates/import_status.html:117 +#: bookwyrm/templates/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" msgstr "Autor/Autora" -#: bookwyrm/templates/import_status.html:140 +#: bookwyrm/templates/import_status.html:148 msgid "Imported" msgstr "Importado" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 -#: bookwyrm/templates/login.html:46 +#: bookwyrm/templates/login.html:51 msgid "Create an Account" msgstr "Crear una cuenta" @@ -1215,27 +1333,27 @@ msgstr "Resultados de búsqueda por \"%(query)s\"" msgid "Matching Books" msgstr "Libros correspondientes" -#: bookwyrm/templates/layout.html:33 +#: bookwyrm/templates/layout.html:40 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:54 bookwyrm/templates/layout.html:55 msgid "Main navigation menu" msgstr "Menú de navigación central" -#: bookwyrm/templates/layout.html:58 +#: bookwyrm/templates/layout.html:65 msgid "Feed" msgstr "Actividad" -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:94 msgid "Your Books" msgstr "Tus libros" -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/layout.html:104 msgid "Settings" msgstr "Configuración" -#: bookwyrm/templates/layout.html:106 +#: bookwyrm/templates/layout.html:113 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1243,63 +1361,63 @@ msgstr "Configuración" msgid "Invites" msgstr "Invitaciones" -#: bookwyrm/templates/layout.html:113 +#: bookwyrm/templates/layout.html:120 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/layout.html:120 +#: bookwyrm/templates/layout.html:127 msgid "Log out" msgstr "Cerrar sesión" -#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 +#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "Notificaciones" -#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 -#: bookwyrm/templates/login.html:17 +#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162 +#: bookwyrm/templates/login.html:22 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nombre de usuario:" -#: bookwyrm/templates/layout.html:156 +#: bookwyrm/templates/layout.html:163 msgid "password" msgstr "contraseña" -#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 -#: bookwyrm/templates/login.html:33 +#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/login.html:38 msgid "Log in" msgstr "Iniciar sesión" -#: bookwyrm/templates/layout.html:168 +#: bookwyrm/templates/layout.html:175 msgid "Join" msgstr "Unirse" -#: bookwyrm/templates/layout.html:206 +#: bookwyrm/templates/layout.html:213 #, fuzzy #| msgid "About this server" msgid "About this instance" msgstr "Sobre este servidor" -#: bookwyrm/templates/layout.html:210 +#: bookwyrm/templates/layout.html:217 msgid "Contact site admin" msgstr "Contactarse con administradores del sitio" -#: bookwyrm/templates/layout.html:214 +#: bookwyrm/templates/layout.html:221 msgid "Documentation" msgstr "Documentación de Django" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:228 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "Apoyar %(site_name)s en %(support_title)s" -#: bookwyrm/templates/layout.html:225 +#: bookwyrm/templates/layout.html:232 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en GitHub." @@ -1450,16 +1568,20 @@ msgstr "Tus listas" msgid "Login" msgstr "Iniciar sesión" -#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 +#: bookwyrm/templates/login.html:16 +msgid "Success! Email address confirmed." +msgstr "" + +#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" msgstr "Contraseña:" -#: bookwyrm/templates/login.html:52 +#: bookwyrm/templates/login.html:57 msgid "Contact an administrator to get an invite" msgstr "Contactar a unx administradorx para recibir una invitación" -#: bookwyrm/templates/login.html:63 +#: bookwyrm/templates/login.html:68 msgid "More about this site" msgstr "Más sobre este sitio" @@ -1677,6 +1799,7 @@ msgstr "¡Estás al día!" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirmar contraseña:" @@ -1690,7 +1813,7 @@ msgstr "Restablecer contraseña" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/preferences_layout.html:26 +#: bookwyrm/templates/preferences/layout.html:30 msgid "Blocked Users" msgstr "Usuarios bloqueados" @@ -1701,7 +1824,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:19 +#: bookwyrm/templates/preferences/layout.html:19 msgid "Change Password" msgstr "Cambiar contraseña" @@ -1709,6 +1832,23 @@ msgstr "Cambiar contraseña" msgid "New password:" msgstr "Nueva contraseña:" +#: bookwyrm/templates/preferences/delete_user.html:4 +#: bookwyrm/templates/preferences/delete_user.html:7 +#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/layout.html:23 +#, fuzzy +#| msgid "Create an Account" +msgid "Delete Account" +msgstr "Crear una cuenta" + +#: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Permanently delete account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:14 +msgid "Deleting your account cannot be undone. The username will not be available to register in the future." +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" @@ -1718,44 +1858,68 @@ msgstr "Editar perfil" msgid "Show set reading goal prompt in feed:" msgstr "Mostrar meta de lectura en el feed:" -#: bookwyrm/templates/preferences/edit_user.html:62 +#: bookwyrm/templates/preferences/edit_user.html:58 +#, fuzzy +#| msgid "Post privacy" +msgid "Default post privacy:" +msgstr "Privacidad de publicación" + +#: bookwyrm/templates/preferences/edit_user.html:70 #, python-format 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/preferences/edit_user.html:65 +#: bookwyrm/templates/preferences/edit_user.html:73 msgid "Preferred Timezone: " msgstr "Huso horario preferido" -#: bookwyrm/templates/preferences/preferences_layout.html:11 +#: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Cuenta" -#: bookwyrm/templates/preferences/preferences_layout.html:15 +#: bookwyrm/templates/preferences/layout.html:15 msgid "Profile" msgstr "Perfil" -#: bookwyrm/templates/preferences/preferences_layout.html:22 +#: bookwyrm/templates/preferences/layout.html:26 msgid "Relationships" msgstr "Relaciones" +#: bookwyrm/templates/reading_progress/finish.html:5 +#, fuzzy, python-format +#| msgid "Finish \"%(book_title)s\"" +msgid "Finish \"%(book_title)s\"" +msgstr "Terminar \"%(book_title)s\"" + +#: bookwyrm/templates/reading_progress/start.html:5 +#, fuzzy, python-format +#| msgid "Edit \"%(book_title)s\"" +msgid "Start \"%(book_title)s\"" +msgstr "Editar \"%(book_title)s\"" + +#: bookwyrm/templates/reading_progress/want.html:5 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Want to Read \"%(book_title)s\"" +msgstr "Quiero leer \"%(book_title)s\"" + #: bookwyrm/templates/rss/title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 +#: bookwyrm/templates/snippets/status/status_header.html:36 msgid "rated" msgstr "calificó" #: bookwyrm/templates/rss/title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 +#: bookwyrm/templates/snippets/status/status_header.html:38 msgid "reviewed" msgstr "reseñó" #: bookwyrm/templates/rss/title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 +#: bookwyrm/templates/snippets/status/status_header.html:40 msgid "commented on" msgstr "comentó en" #: bookwyrm/templates/rss/title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 +#: bookwyrm/templates/snippets/status/status_header.html:42 msgid "quoted" msgstr "citó" @@ -1779,12 +1943,6 @@ msgstr "Búsqueda" msgid "Search type" msgstr "Tipo de búsqueda" -#: bookwyrm/templates/search/layout.html:21 -#: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:74 -msgid "Books" -msgstr "Libros" - #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 #: bookwyrm/templates/settings/admin_layout.html:26 @@ -1966,6 +2124,10 @@ msgstr "Instancia:" msgid "Status:" msgstr "Status:" +#: bookwyrm/templates/settings/edit_server.html:40 +msgid "Federated" +msgstr "Federalizado" + #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 msgid "Blocked" @@ -1992,7 +2154,7 @@ msgid "Details" msgstr "Detalles" #: bookwyrm/templates/settings/federated_server.html:39 -#: bookwyrm/templates/user/layout.html:56 +#: bookwyrm/templates/user/layout.html:63 msgid "Activity" msgstr "Actividad" @@ -2031,7 +2193,7 @@ msgid "Edit" msgstr "Editar" #: bookwyrm/templates/settings/federated_server.html:105 -#: bookwyrm/templates/user_admin/user_moderation_actions.html:3 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:8 msgid "Actions" msgstr "Acciones" @@ -2239,15 +2401,27 @@ msgstr "Correo electrónico de administradorx:" msgid "Additional info:" msgstr "Más informacion:" -#: bookwyrm/templates/settings/site.html:83 -msgid "Allow registration:" +#: bookwyrm/templates/settings/site.html:85 +#, fuzzy +#| msgid "Allow registration:" +msgid "Allow registration" msgstr "Permitir registración:" -#: bookwyrm/templates/settings/site.html:87 -msgid "Allow invite requests:" +#: bookwyrm/templates/settings/site.html:91 +#, fuzzy +#| msgid "Allow invite requests:" +msgid "Allow invite requests" msgstr "Permitir solicitudes de invitación:" -#: bookwyrm/templates/settings/site.html:91 +#: bookwyrm/templates/settings/site.html:97 +msgid "Require users to confirm email address" +msgstr "" + +#: bookwyrm/templates/settings/site.html:99 +msgid "(Recommended if registration is open)" +msgstr "" + +#: bookwyrm/templates/settings/site.html:102 msgid "Registration closed text:" msgstr "Texto de registración cerrada:" @@ -2256,13 +2430,21 @@ msgstr "Texto de registración cerrada:" msgid "Posted by %(username)s" msgstr "Publicado por %(username)s" -#: bookwyrm/templates/snippets/book_cover.html:31 +#: bookwyrm/templates/snippets/authors.html:22 +#, python-format +msgid "and %(remainder_count_display)s other" +msgid_plural "and %(remainder_count_display)s others" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/book_cover.html:32 msgid "No cover" msgstr "Sin portada" -#: bookwyrm/templates/snippets/book_titleby.html:4 -#, python-format -msgid "%(title)s by " +#: bookwyrm/templates/snippets/book_titleby.html:6 +#, fuzzy, python-format +#| msgid "%(title)s by " +msgid "%(title)s by" msgstr "%(title)s por " #: bookwyrm/templates/snippets/boost_button.html:20 @@ -2344,7 +2526,7 @@ msgstr "Incluir alerta de 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 +#: bookwyrm/templates/snippets/privacy_select.html:20 msgid "Private" msgstr "Privada" @@ -2461,7 +2643,7 @@ 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/start_reading_modal.html:31 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" msgstr "Compartir con tu feed" @@ -2506,13 +2688,13 @@ msgstr "Siguiente" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 -#: bookwyrm/templates/snippets/privacy_select.html:10 +#: bookwyrm/templates/snippets/privacy_select.html:11 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 +#: bookwyrm/templates/snippets/privacy_select.html:14 msgid "Unlisted" msgstr "Privado" @@ -2524,7 +2706,7 @@ msgstr "Solo seguidores" msgid "Post privacy" msgstr "Privacidad de publicación" -#: bookwyrm/templates/snippets/privacy_select.html:16 +#: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" @@ -2538,38 +2720,9 @@ msgstr "Da una calificación" msgid "Rate" msgstr "Calificar" -#: bookwyrm/templates/snippets/readthrough.html:8 -msgid "Progress Updates:" -msgstr "Actualizaciones de progreso:" - -#: bookwyrm/templates/snippets/readthrough.html:14 -msgid "finished" -msgstr "terminado" - -#: bookwyrm/templates/snippets/readthrough.html:25 -msgid "Show all updates" -msgstr "Mostrar todas las actualizaciones" - -#: bookwyrm/templates/snippets/readthrough.html:41 -msgid "Delete this progress update" -msgstr "Eliminar esta actualización de progreso" - -#: bookwyrm/templates/snippets/readthrough.html:52 -msgid "started" -msgstr "empezado" - -#: 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:63 -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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "Lectura se empezó" @@ -2604,7 +2757,7 @@ msgid "Finish \"%(book_title)s\"" msgstr "Terminar \"%(book_title)s\"" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 msgid "Update progress" msgstr "Progreso de actualización" @@ -2612,20 +2765,20 @@ msgstr "Progreso de actualización" msgid "More shelves" msgstr "Más estantes" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11 msgid "Start reading" msgstr "Empezar leer" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19 msgid "Finish reading" msgstr "Terminar de leer" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 #: 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:47 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57 #, python-format msgid "Remove from %(name)s" msgstr "Quitar de %(name)s" @@ -2640,17 +2793,17 @@ msgstr "Empezar \"%(book_title)s\"" msgid "Want to Read \"%(book_title)s\"" msgstr "Quiero leer \"%(book_title)s\"" -#: bookwyrm/templates/snippets/status/content_status.html:71 +#: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" msgstr "Mostrar más" -#: bookwyrm/templates/snippets/status/content_status.html:86 +#: bookwyrm/templates/snippets/status/content_status.html:87 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" msgstr "Mostrar menos" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:117 msgid "Open image in new window" msgstr "Abrir imagen en una nueva ventana" @@ -2673,7 +2826,7 @@ msgstr "Me gusta status" msgid "boosted" msgstr "respaldó" -#: bookwyrm/templates/snippets/status/status_header.html:45 +#: bookwyrm/templates/snippets/status/status_header.html:46 #, python-format msgid "replied to %(username)s's status" msgstr "respondió al status de %(username)s " @@ -2689,10 +2842,31 @@ msgstr "Eliminar y recomponer" #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:13 -#: bookwyrm/templates/user_admin/user_moderation_actions.html:6 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:12 msgid "Send direct message" msgstr "Enviar mensaje directo" +#: bookwyrm/templates/snippets/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "%(mutuals)s seguidor que sigues" +msgstr[1] "%(mutuals)s seguidores que sigues" + +#: bookwyrm/templates/snippets/suggested_users.html:23 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "%(shared_books)s libro en tus estantes" +msgstr[1] "%(shared_books)s libros en tus estantes" + +#: bookwyrm/templates/snippets/suggested_users.html:31 +#: bookwyrm/templates/user/user_preview.html:36 +#, fuzzy +#| msgid "followed you" +msgid "Follows you" +msgstr "te siguió" + #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" msgstr "Cambiar a esta edición" @@ -2705,15 +2879,15 @@ msgstr "En orden ascendente" msgid "Sorted descending" msgstr "En orden descendente" -#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 +#: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Perfil de usuario" -#: bookwyrm/templates/user/layout.html:37 +#: bookwyrm/templates/user/layout.html:44 msgid "Follow Requests" msgstr "Solicitudes de seguidor" -#: bookwyrm/templates/user/layout.html:62 +#: bookwyrm/templates/user/layout.html:69 msgid "Reading Goal" msgstr "Meta de lectura" @@ -2819,30 +2993,37 @@ msgstr "Feed RSS" msgid "No activities yet!" msgstr "¡Aún no actividades!" -#: bookwyrm/templates/user/user_preview.html:15 +#: bookwyrm/templates/user/user_preview.html:22 #, python-format msgid "Joined %(date)s" msgstr "Unido %(date)s" -#: bookwyrm/templates/user/user_preview.html:19 +#: bookwyrm/templates/user/user_preview.html:26 #, 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:20 +#: bookwyrm/templates/user/user_preview.html:27 #, python-format msgid "%(counter)s following" msgstr "%(counter)s siguiendo" -#: bookwyrm/templates/user/user_preview.html:26 +#: bookwyrm/templates/user/user_preview.html:34 #, 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" msgstr[1] "%(mutuals_display)s seguidores que sigues" +#: bookwyrm/templates/user/user_preview.html:38 +#, fuzzy +#| msgid "follower you follow" +#| msgid_plural "followers you follow" +msgid "No followers you follow" +msgstr "seguidor que tu sigues" + #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" msgstr "Volver a usuarios" @@ -2900,22 +3081,35 @@ msgstr "Detalles de instancia" msgid "View instance" msgstr "Ver instancia" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:11 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:5 +msgid "Permanently deleted" +msgstr "" + +#: bookwyrm/templates/user_admin/user_moderation_actions.html:17 msgid "Suspend user" msgstr "Suspender usuario" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:13 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:19 msgid "Un-suspend user" msgstr "Des-suspender usuario" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:21 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:28 msgid "Access level:" msgstr "Nivel de acceso:" -#: 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 "" +#: bookwyrm/templatetags/utilities.py:30 +#, python-format +msgid "%(title)s: %(subtitle)s" +msgstr "" + +#: bookwyrm/views/authentication.py:69 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "No un archivo csv válido" @@ -2929,6 +3123,18 @@ 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 "Local Timeline" +#~ msgstr "Línea temporal local" + +#~ msgid "Federated Timeline" +#~ msgstr "Línea temporal federalizado" + +#~ msgid "Local" +#~ msgstr "Local" + +#~ msgid "Remove %(name)s" +#~ msgstr "Eliminar %(name)s" + #~ msgid "Federated Servers" #~ msgstr "Servidores federalizados" @@ -2981,9 +3187,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ 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" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 3d622ac66..f8ade2a39 100644 Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index d29afc1cf..f0a559f97 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-09 16:46+0000\n" +"POT-Creation-Date: 2021-08-07 01:35+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -18,99 +18,125 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:224 +#: bookwyrm/forms.py:232 msgid "A user with this email already exists." msgstr "Cet email est déjà associé à un compte." -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:246 msgid "One Day" msgstr "Un jour" -#: bookwyrm/forms.py:239 +#: bookwyrm/forms.py:247 msgid "One Week" msgstr "Une semaine" -#: bookwyrm/forms.py:240 +#: bookwyrm/forms.py:248 msgid "One Month" msgstr "Un mois" -#: bookwyrm/forms.py:241 +#: bookwyrm/forms.py:249 msgid "Does Not Expire" msgstr "Sans expiration" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:254 #, python-format msgid "%(count)d uses" msgstr "%(count)d utilisations" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:257 msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms.py:299 +#: bookwyrm/forms.py:307 msgid "List Order" msgstr "Ordre de la liste" -#: bookwyrm/forms.py:300 +#: bookwyrm/forms.py:308 msgid "Book Title" msgstr "Titre du livre" -#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 +#: bookwyrm/forms.py:309 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" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Trier par" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:315 msgid "Ascending" msgstr "Ordre croissant" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:316 msgid "Descending" msgstr "Ordre décroissant" -#: bookwyrm/models/fields.py:25 +#: bookwyrm/models/fields.py:27 #, 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:34 bookwyrm/models/fields.py:43 +#: bookwyrm/models/fields.py:36 bookwyrm/models/fields.py:45 #, 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:166 bookwyrm/templates/layout.html:152 +#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159 msgid "username" msgstr "nom du compte :" -#: bookwyrm/models/fields.py:171 +#: bookwyrm/models/fields.py:179 msgid "A user with that username already exists." msgstr "Ce nom est déjà associé à un compte." -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:123 +msgid "Home Timeline" +msgstr "Mon fil d’actualité" + +#: bookwyrm/settings.py:123 +msgid "Home" +msgstr "Accueil" + +#: bookwyrm/settings.py:124 +#, fuzzy +#| msgid "Book Title" +msgid "Books Timeline" +msgstr "Titre du livre" + +#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/templates/search/layout.html:42 +#: bookwyrm/templates/user/layout.html:81 +msgid "Books" +msgstr "Livres" + +#: bookwyrm/settings.py:170 msgid "English" msgstr "English" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:171 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:172 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:173 msgid "French" msgstr "Français" -#: bookwyrm/settings.py:160 +#: bookwyrm/settings.py:174 msgid "Simplified Chinese" msgstr "简化字" +#: bookwyrm/settings.py:175 +#, fuzzy +#| msgid "Additional info:" +msgid "Traditional Chinese" +msgstr "Infos supplémentaires :" + #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" msgstr "Introuvable" @@ -154,12 +180,12 @@ msgid "Wikipedia" msgstr "Wikipedia" #: bookwyrm/templates/author/author.html:69 -#: bookwyrm/templates/book/book.html:87 +#: bookwyrm/templates/book/book.html:95 msgid "View on OpenLibrary" msgstr "Voir sur OpenLibrary" #: bookwyrm/templates/author/author.html:77 -#: bookwyrm/templates/book/book.html:90 +#: bookwyrm/templates/book/book.html:98 msgid "View on Inventaire" msgstr "Voir sur Inventaire" @@ -252,142 +278,142 @@ msgid "Goodreads key:" msgstr "Clé Goodreads :" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:133 +#: bookwyrm/templates/book/book.html:141 #: bookwyrm/templates/book/edit_book.html:321 +#: bookwyrm/templates/book/readthrough.html:77 #: bookwyrm/templates/lists/form.html:42 -#: bookwyrm/templates/preferences/edit_user.html:70 +#: bookwyrm/templates/preferences/edit_user.html:78 #: 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:101 -#: bookwyrm/templates/snippets/readthrough.html:77 +#: bookwyrm/templates/settings/site.html:108 #: 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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "Enregistrer" #: bookwyrm/templates/author/edit_author.html:117 -#: bookwyrm/templates/book/book.html:134 bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:322 +#: bookwyrm/templates/book/readthrough.html:78 #: bookwyrm/templates/moderation/report_modal.html:34 #: 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 #: 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/start_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" msgstr "Annuler" -#: bookwyrm/templates/book/book.html:40 +#: bookwyrm/templates/book/book.html:48 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" msgstr "par" -#: bookwyrm/templates/book/book.html:48 bookwyrm/templates/book/book.html:49 +#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 msgid "Edit Book" msgstr "Modifier le livre" -#: bookwyrm/templates/book/book.html:66 +#: bookwyrm/templates/book/book.html:74 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "Ajouter une couverture" -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:78 msgid "Failed to load cover" msgstr "La couverture n’a pu être chargée" -#: bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:118 #, 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:122 +#: bookwyrm/templates/book/book.html:130 msgid "Add Description" msgstr "Ajouter une description" -#: bookwyrm/templates/book/book.html:129 +#: bookwyrm/templates/book/book.html:137 #: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Description :" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:151 #, python-format msgid "%(count)s editions" msgstr "%(count)s éditions" -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:159 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "Cette édition est sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:157 +#: bookwyrm/templates/book/book.html:165 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Une édition différente de ce livre existe sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/book/book.html:176 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book/book.html:171 +#: bookwyrm/templates/book/book.html:179 msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:188 msgid "Create" msgstr "Créer" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:198 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:209 +#: bookwyrm/templates/book/book.html:217 msgid "Reviews" msgstr "Critiques" -#: bookwyrm/templates/book/book.html:214 +#: bookwyrm/templates/book/book.html:222 msgid "Your reviews" msgstr "Vos critiques" -#: bookwyrm/templates/book/book.html:220 +#: bookwyrm/templates/book/book.html:228 msgid "Your comments" msgstr "Vos commentaires" -#: bookwyrm/templates/book/book.html:226 +#: bookwyrm/templates/book/book.html:234 msgid "Your quotes" msgstr "Vos citations" -#: bookwyrm/templates/book/book.html:262 +#: bookwyrm/templates/book/book.html:270 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book/book.html:274 +#: bookwyrm/templates/book/book.html:282 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:285 bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 #: 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:68 +#: bookwyrm/templates/user/layout.html:75 msgid "Lists" msgstr "Listes" -#: bookwyrm/templates/book/book.html:296 +#: bookwyrm/templates/book/book.html:304 msgid "Add to list" msgstr "Ajouter à la liste" -#: bookwyrm/templates/book/book.html:306 +#: bookwyrm/templates/book/book.html:314 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -615,11 +641,40 @@ msgstr "Publié par %(publisher)s." msgid "rated it" msgstr "l’a noté" +#: bookwyrm/templates/book/readthrough.html:8 +msgid "Progress Updates:" +msgstr "Progression :" + +#: bookwyrm/templates/book/readthrough.html:14 +msgid "finished" +msgstr "terminé" + +#: bookwyrm/templates/book/readthrough.html:25 +msgid "Show all updates" +msgstr "Montrer toutes les progressions" + +#: bookwyrm/templates/book/readthrough.html:41 +msgid "Delete this progress update" +msgstr "Supprimer cette mise à jour" + +#: bookwyrm/templates/book/readthrough.html:52 +msgid "started" +msgstr "commencé" + +#: bookwyrm/templates/book/readthrough.html:59 +#: bookwyrm/templates/book/readthrough.html:73 +msgid "Edit read dates" +msgstr "Modifier les date de lecture" + +#: bookwyrm/templates/book/readthrough.html:63 +msgid "Delete these read dates" +msgstr "Supprimer ces dates de lecture" + #: 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/feed/layout.html:71 +#: bookwyrm/templates/get_started/layout.html:20 +#: bookwyrm/templates/get_started/layout.html:53 #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" @@ -629,6 +684,60 @@ msgstr "Fermer" msgid "Compose status" msgstr "Rédiger un statut" +#: bookwyrm/templates/confirm_email/confirm_email.html:4 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm email" +msgstr "Confirmer" + +#: bookwyrm/templates/confirm_email/confirm_email.html:7 +#, fuzzy +#| msgid "Email address:" +msgid "Confirm your email address" +msgstr "Adresse email :" + +#: bookwyrm/templates/confirm_email/confirm_email.html:13 +msgid "A confirmation code has been sent to the email address you used to register your account." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:15 +msgid "Sorry! We couldn't find that code." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:19 +#, fuzzy +#| msgid "Confirm password:" +msgid "Confirmation code:" +msgstr "Confirmez le mot de passe :" + +#: bookwyrm/templates/confirm_email/confirm_email.html:25 +#: bookwyrm/templates/discover/landing_layout.html:70 +#: bookwyrm/templates/moderation/report_modal.html:33 +msgid "Submit" +msgstr "Valider" + +#: bookwyrm/templates/confirm_email/confirm_email.html:32 +msgid "Can't find your code?" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:4 +msgid "Resend confirmation link" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:11 +#: 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/confirm_email/resend_form.html:17 +#, fuzzy +#| msgid "Re-send invite" +msgid "Resend link" +msgstr "Envoyer l’invitation de nouveau" + #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" msgstr "Communauté" @@ -643,7 +752,7 @@ msgstr "Communauté fédérée" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/layout.html:71 msgid "Directory" msgstr "Répertoire" @@ -674,23 +783,32 @@ msgstr "Suggéré" msgid "Recently active" msgstr "Actif récemment" -#: bookwyrm/templates/directory/user_card.html:33 +#: bookwyrm/templates/directory/user_card.html:17 +#: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/user/user_preview.html:16 +#: bookwyrm/templates/user/user_preview.html:17 +#, fuzzy +#| msgid "Your Account" +msgid "Locked account" +msgstr "Votre compte" + +#: bookwyrm/templates/directory/user_card.html:40 msgid "follower you follow" msgid_plural "followers you follow" msgstr[0] "compte que vous suivez" msgstr[1] "comptes que vous suivez" -#: bookwyrm/templates/directory/user_card.html:40 +#: bookwyrm/templates/directory/user_card.html:47 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:48 +#: bookwyrm/templates/directory/user_card.html:55 msgid "posts" msgstr "publications" -#: bookwyrm/templates/directory/user_card.html:54 +#: bookwyrm/templates/directory/user_card.html:61 msgid "last active" msgstr "dernière activité" @@ -726,7 +844,7 @@ msgid "Recent Books" msgstr "Livres récents" #: bookwyrm/templates/discover/landing_layout.html:5 -#: bookwyrm/templates/get_started/layout.html:4 +#: bookwyrm/templates/get_started/layout.html:5 msgid "Welcome" msgstr "Bienvenue" @@ -748,7 +866,7 @@ msgid "Join %(name)s" msgstr "Rejoignez %(name)s" #: bookwyrm/templates/discover/landing_layout.html:51 -#: bookwyrm/templates/login.html:51 +#: bookwyrm/templates/login.html:56 msgid "This instance is closed" msgstr "Cette instance est fermée" @@ -760,22 +878,26 @@ msgstr "Merci ! Votre demande a bien été reçue." msgid "Request an Invitation" 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 "Adresse email :" - -#: bookwyrm/templates/discover/landing_layout.html:70 -#: bookwyrm/templates/moderation/report_modal.html:33 -msgid "Submit" -msgstr "Valider" - #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" msgstr "Votre compte" +#: bookwyrm/templates/email/confirm/html_content.html:6 +#: bookwyrm/templates/email/confirm/text_content.html:4 +#, python-format +msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:11 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm Email" +msgstr "Confirmer" + +#: bookwyrm/templates/email/confirm/subject.html:2 +msgid "Please confirm your email" +msgstr "" + #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," @@ -844,7 +966,7 @@ msgid "Direct Messages with %(username)s" msgstr "Messages directs avec %(username)s" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:99 msgid "Direct Messages" msgstr "Messages directs" @@ -856,93 +978,55 @@ 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:8 -msgid "Home Timeline" -msgstr "Mon fil d’actualité" - -#: bookwyrm/templates/feed/feed.html:10 -msgid "Local Timeline" -msgstr "Fil d’actualité local" - -#: bookwyrm/templates/feed/feed.html:12 -msgid "Federated Timeline" -msgstr "Fil d’actualité des instances fédérées" - -#: bookwyrm/templates/feed/feed.html:18 -msgid "Home" -msgstr "Accueil" - -#: bookwyrm/templates/feed/feed.html:21 -msgid "Local" -msgstr "Local" - -#: bookwyrm/templates/feed/feed.html:24 -#: bookwyrm/templates/settings/edit_server.html:40 -msgid "Federated" -msgstr "Fédéré" - -#: bookwyrm/templates/feed/feed.html:32 -#, python-format -msgid "load 0 unread status(es)" +#: bookwyrm/templates/feed/feed.html:22 +#, fuzzy, python-format +#| msgid "load 0 unread status(es)" +msgid "load 0 unread status(es)" msgstr "charger le(s) 0 statut(s) non lu(s)" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:38 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" - -#: bookwyrm/templates/feed/feed_layout.html:4 +#: bookwyrm/templates/feed/layout.html:5 msgid "Updates" msgstr "Mises à jour" -#: bookwyrm/templates/feed/feed_layout.html:10 +#: bookwyrm/templates/feed/layout.html:12 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "Vos livres" -#: bookwyrm/templates/feed/feed_layout.html:12 +#: bookwyrm/templates/feed/layout.html:14 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/feed/layout.html:25 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "To Read" msgstr "À lire" -#: bookwyrm/templates/feed/feed_layout.html:24 +#: bookwyrm/templates/feed/layout.html:26 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Currently Reading" msgstr "Lectures en cours" -#: bookwyrm/templates/feed/feed_layout.html:25 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 +#: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" msgstr "Lu" -#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 +#: bookwyrm/templates/feed/layout.html:90 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/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" - -#: 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" +#: bookwyrm/templates/feed/suggested_users.html:3 +#: bookwyrm/templates/get_started/users.html:6 +msgid "Who to follow" +msgstr "À qui s’abonner" #: bookwyrm/templates/get_started/book_preview.html:6 #, python-format @@ -973,7 +1057,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:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45 #: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 @@ -999,33 +1083,33 @@ msgstr "Aucun livre trouvé" msgid "Save & continue" msgstr "Enregistrer & continuer" -#: bookwyrm/templates/get_started/layout.html:14 +#: bookwyrm/templates/get_started/layout.html:15 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bienvenue sur %(site_name)s !" -#: bookwyrm/templates/get_started/layout.html:16 +#: bookwyrm/templates/get_started/layout.html:17 msgid "These are some first steps to get you started." msgstr "Voici quelques étapes pour commencer votre profil." -#: bookwyrm/templates/get_started/layout.html:30 +#: bookwyrm/templates/get_started/layout.html:31 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" msgstr "Créez votre profil" -#: bookwyrm/templates/get_started/layout.html:34 +#: bookwyrm/templates/get_started/layout.html:35 msgid "Add books" msgstr "Ajoutez des livres" -#: bookwyrm/templates/get_started/layout.html:38 +#: bookwyrm/templates/get_started/layout.html:39 msgid "Find friends" msgstr "Établissez des contacts" -#: bookwyrm/templates/get_started/layout.html:44 +#: bookwyrm/templates/get_started/layout.html:45 msgid "Skip this step" msgstr "Passer cette étape" -#: bookwyrm/templates/get_started/layout.html:48 +#: bookwyrm/templates/get_started/layout.html:49 msgid "Finish" msgstr "Terminer" @@ -1054,7 +1138,7 @@ msgid "Manually approve followers:" msgstr "Autoriser les abonnements manuellement :" #: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:58 +#: bookwyrm/templates/preferences/edit_user.html:66 msgid "Show this account in suggested users:" msgstr "Afficher ce compte dans ceux suggérés :" @@ -1135,80 +1219,92 @@ msgstr "Importations récentes" msgid "No recent imports" msgstr "Aucune importation récente" -#: bookwyrm/templates/import_status.html:5 -#: bookwyrm/templates/import_status.html:9 +#: 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:13 +#: bookwyrm/templates/import_status.html:11 +#, fuzzy +#| msgid "Back to reports" +msgid "Back to imports" +msgstr "Retour aux signalements" + +#: bookwyrm/templates/import_status.html:15 msgid "Import started:" msgstr "Début de l’importation :" -#: bookwyrm/templates/import_status.html:18 +#: bookwyrm/templates/import_status.html:20 msgid "Import completed:" msgstr "Fin de l’importation :" -#: bookwyrm/templates/import_status.html:23 +#: bookwyrm/templates/import_status.html:25 msgid "TASK FAILED" msgstr "la tâche a échoué" -#: bookwyrm/templates/import_status.html:30 +#: bookwyrm/templates/import_status.html:32 msgid "Import still in progress." msgstr "L’importation est toujours en cours" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import_status.html:34 msgid "(Hit reload to update!)" msgstr "(Rechargez la page pour la mettre à jour !)" -#: bookwyrm/templates/import_status.html:39 +#: bookwyrm/templates/import_status.html:41 msgid "Failed to load" msgstr "Éléments non importés" -#: bookwyrm/templates/import_status.html:48 +#: bookwyrm/templates/import_status.html:50 #, 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:60 +#: bookwyrm/templates/import_status.html:62 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" msgstr "Ligne %(index)s : %(title)s par %(author)s" -#: bookwyrm/templates/import_status.html:80 +#: bookwyrm/templates/import_status.html:82 msgid "Select all" msgstr "Tout sélectionner" -#: bookwyrm/templates/import_status.html:83 +#: bookwyrm/templates/import_status.html:85 msgid "Retry items" msgstr "Réessayer l’importation de ces éléments" -#: bookwyrm/templates/import_status.html:109 +#: bookwyrm/templates/import_status.html:112 msgid "Successfully imported" msgstr "Importation réussie" -#: bookwyrm/templates/import_status.html:113 +#: bookwyrm/templates/import_status.html:114 +#, fuzzy +#| msgid "Import still in progress." +msgid "Import Progress" +msgstr "L’importation est toujours en cours" + +#: bookwyrm/templates/import_status.html:119 msgid "Book" msgstr "Livre" -#: bookwyrm/templates/import_status.html:116 +#: bookwyrm/templates/import_status.html:122 #: 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" -#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" msgstr "Auteur/autrice" -#: bookwyrm/templates/import_status.html:142 +#: bookwyrm/templates/import_status.html:148 msgid "Imported" msgstr "Importé" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 -#: bookwyrm/templates/login.html:46 +#: bookwyrm/templates/login.html:51 msgid "Create an Account" msgstr "Créer un compte" @@ -1233,27 +1329,27 @@ msgstr "Résultats de recherche pour « %(query)s »" msgid "Matching Books" msgstr "Livres correspondants" -#: bookwyrm/templates/layout.html:33 +#: bookwyrm/templates/layout.html:40 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:54 bookwyrm/templates/layout.html:55 msgid "Main navigation menu" msgstr "Menu de navigation principal " -#: bookwyrm/templates/layout.html:58 +#: bookwyrm/templates/layout.html:65 msgid "Feed" msgstr "Fil d’actualité" -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:94 msgid "Your Books" msgstr "Vos Livres" -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/layout.html:104 msgid "Settings" msgstr "Paramètres" -#: bookwyrm/templates/layout.html:106 +#: bookwyrm/templates/layout.html:113 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1261,61 +1357,61 @@ msgstr "Paramètres" msgid "Invites" msgstr "Invitations" -#: bookwyrm/templates/layout.html:113 +#: bookwyrm/templates/layout.html:120 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/layout.html:120 +#: bookwyrm/templates/layout.html:127 msgid "Log out" msgstr "Se déconnecter" -#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 +#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "Notifications" -#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 -#: bookwyrm/templates/login.html:17 +#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162 +#: bookwyrm/templates/login.html:22 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nom du compte :" -#: bookwyrm/templates/layout.html:156 +#: bookwyrm/templates/layout.html:163 msgid "password" msgstr "Mot de passe" -#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41 msgid "Forgot your password?" msgstr "Mot de passe oublié ?" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 -#: bookwyrm/templates/login.html:33 +#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/login.html:38 msgid "Log in" msgstr "Se connecter" -#: bookwyrm/templates/layout.html:168 +#: bookwyrm/templates/layout.html:175 msgid "Join" msgstr "Rejoindre" -#: bookwyrm/templates/layout.html:206 +#: bookwyrm/templates/layout.html:213 msgid "About this instance" msgstr "À propos de cette instance" -#: bookwyrm/templates/layout.html:210 +#: bookwyrm/templates/layout.html:217 msgid "Contact site admin" msgstr "Contacter l’administrateur du site" -#: bookwyrm/templates/layout.html:214 +#: bookwyrm/templates/layout.html:221 msgid "Documentation" msgstr "Documentation" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:228 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "Soutenez %(site_name)s avec %(support_title)s" -#: bookwyrm/templates/layout.html:225 +#: bookwyrm/templates/layout.html:232 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via GitHub." @@ -1466,16 +1562,20 @@ msgstr "Vos listes" msgid "Login" msgstr "Connexion" -#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 +#: bookwyrm/templates/login.html:16 +msgid "Success! Email address confirmed." +msgstr "" + +#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" msgstr "Mot de passe :" -#: bookwyrm/templates/login.html:52 +#: bookwyrm/templates/login.html:57 msgid "Contact an administrator to get an invite" msgstr "Contacter un administrateur pour obtenir une invitation" -#: bookwyrm/templates/login.html:63 +#: bookwyrm/templates/login.html:68 msgid "More about this site" msgstr "En savoir plus sur ce site" @@ -1693,6 +1793,7 @@ msgstr "Aucune nouvelle notification !" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirmez le mot de passe :" @@ -1706,7 +1807,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:26 +#: bookwyrm/templates/preferences/layout.html:30 msgid "Blocked Users" msgstr "Comptes bloqués" @@ -1717,7 +1818,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:19 +#: bookwyrm/templates/preferences/layout.html:19 msgid "Change Password" msgstr "Changer le mot de passe" @@ -1725,6 +1826,23 @@ msgstr "Changer le mot de passe" msgid "New password:" msgstr "Nouveau mot de passe :" +#: bookwyrm/templates/preferences/delete_user.html:4 +#: bookwyrm/templates/preferences/delete_user.html:7 +#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/layout.html:23 +#, fuzzy +#| msgid "Create an Account" +msgid "Delete Account" +msgstr "Créer un compte" + +#: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Permanently delete account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:14 +msgid "Deleting your account cannot be undone. The username will not be available to register in the future." +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" @@ -1734,44 +1852,68 @@ msgstr "Modifier le profil" 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 +#: bookwyrm/templates/preferences/edit_user.html:58 +#, fuzzy +#| msgid "Post privacy" +msgid "Default post privacy:" +msgstr "Confidentialité du statut" + +#: bookwyrm/templates/preferences/edit_user.html:70 #, python-format 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/preferences/edit_user.html:65 +#: bookwyrm/templates/preferences/edit_user.html:73 msgid "Preferred Timezone: " msgstr "Fuseau horaire préféré" -#: bookwyrm/templates/preferences/preferences_layout.html:11 +#: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Compte" -#: bookwyrm/templates/preferences/preferences_layout.html:15 +#: bookwyrm/templates/preferences/layout.html:15 msgid "Profile" msgstr "Profil" -#: bookwyrm/templates/preferences/preferences_layout.html:22 +#: bookwyrm/templates/preferences/layout.html:26 msgid "Relationships" msgstr "Relations" +#: bookwyrm/templates/reading_progress/finish.html:5 +#, fuzzy, python-format +#| msgid "Finish \"%(book_title)s\"" +msgid "Finish \"%(book_title)s\"" +msgstr "Terminer « %(book_title)s »" + +#: bookwyrm/templates/reading_progress/start.html:5 +#, fuzzy, python-format +#| msgid "Edit \"%(book_title)s\"" +msgid "Start \"%(book_title)s\"" +msgstr "Modifier « %(book_title)s »" + +#: bookwyrm/templates/reading_progress/want.html:5 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Want to Read \"%(book_title)s\"" +msgstr "Ajouter « %(book_title)s » aux envies de lecture" + #: bookwyrm/templates/rss/title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 +#: bookwyrm/templates/snippets/status/status_header.html:36 msgid "rated" msgstr "a noté" #: bookwyrm/templates/rss/title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 +#: bookwyrm/templates/snippets/status/status_header.html:38 msgid "reviewed" msgstr "a écrit une critique de" #: bookwyrm/templates/rss/title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 +#: bookwyrm/templates/snippets/status/status_header.html:40 msgid "commented on" msgstr "a commenté" #: bookwyrm/templates/rss/title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 +#: bookwyrm/templates/snippets/status/status_header.html:42 msgid "quoted" msgstr "a cité" @@ -1795,12 +1937,6 @@ msgstr "Requête" msgid "Search type" 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 "Livres" - #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 #: bookwyrm/templates/settings/admin_layout.html:26 @@ -1976,6 +2112,10 @@ msgstr "Instance :" msgid "Status:" msgstr "Statut :" +#: bookwyrm/templates/settings/edit_server.html:40 +msgid "Federated" +msgstr "Fédéré" + #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 msgid "Blocked" @@ -2002,7 +2142,7 @@ msgid "Details" msgstr "Détails" #: bookwyrm/templates/settings/federated_server.html:39 -#: bookwyrm/templates/user/layout.html:56 +#: bookwyrm/templates/user/layout.html:63 msgid "Activity" msgstr "Activité" @@ -2041,7 +2181,7 @@ msgid "Edit" msgstr "Modifier" #: bookwyrm/templates/settings/federated_server.html:105 -#: bookwyrm/templates/user_admin/user_moderation_actions.html:3 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:8 msgid "Actions" msgstr "Actions" @@ -2255,7 +2395,15 @@ msgstr "Autoriser les inscriptions" msgid "Allow invite requests" msgstr "Autoriser les demandes d’invitation" -#: bookwyrm/templates/settings/site.html:95 +#: bookwyrm/templates/settings/site.html:97 +msgid "Require users to confirm email address" +msgstr "" + +#: bookwyrm/templates/settings/site.html:99 +msgid "(Recommended if registration is open)" +msgstr "" + +#: bookwyrm/templates/settings/site.html:102 msgid "Registration closed text:" msgstr "Texte affiché lorsque les inscriptions sont closes :" @@ -2264,13 +2412,21 @@ msgstr "Texte affiché lorsque les inscriptions sont closes :" msgid "Posted by %(username)s" msgstr "Publiée par %(username)s" -#: bookwyrm/templates/snippets/book_cover.html:31 +#: bookwyrm/templates/snippets/authors.html:22 +#, python-format +msgid "and %(remainder_count_display)s other" +msgid_plural "and %(remainder_count_display)s others" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/book_cover.html:32 msgid "No cover" msgstr "Pas de couverture" -#: bookwyrm/templates/snippets/book_titleby.html:4 -#, python-format -msgid "%(title)s by " +#: bookwyrm/templates/snippets/book_titleby.html:6 +#, fuzzy, python-format +#| msgid "%(title)s by " +msgid "%(title)s by" msgstr "%(title)s par " #: bookwyrm/templates/snippets/boost_button.html:20 @@ -2352,7 +2508,7 @@ 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 +#: bookwyrm/templates/snippets/privacy_select.html:20 msgid "Private" msgstr "Privé" @@ -2469,7 +2625,7 @@ 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/start_reading_modal.html:31 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" msgstr "Publier sur le fil d’actualité" @@ -2513,13 +2669,13 @@ msgstr "Suivante" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 -#: bookwyrm/templates/snippets/privacy_select.html:10 +#: bookwyrm/templates/snippets/privacy_select.html:11 msgid "Public" msgstr "Public" #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 -#: bookwyrm/templates/snippets/privacy_select.html:13 +#: bookwyrm/templates/snippets/privacy_select.html:14 msgid "Unlisted" msgstr "Non listé" @@ -2531,7 +2687,7 @@ msgstr "Abonnemé(e)s uniquement" msgid "Post privacy" msgstr "Confidentialité du statut" -#: bookwyrm/templates/snippets/privacy_select.html:16 +#: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" @@ -2545,38 +2701,9 @@ msgstr "Laisser une note" msgid "Rate" msgstr "Noter" -#: bookwyrm/templates/snippets/readthrough.html:8 -msgid "Progress Updates:" -msgstr "Progression :" - -#: bookwyrm/templates/snippets/readthrough.html:14 -msgid "finished" -msgstr "terminé" - -#: bookwyrm/templates/snippets/readthrough.html:25 -msgid "Show all updates" -msgstr "Montrer toutes les progressions" - -#: bookwyrm/templates/snippets/readthrough.html:41 -msgid "Delete this progress update" -msgstr "Supprimer cette mise à jour" - -#: bookwyrm/templates/snippets/readthrough.html:52 -msgid "started" -msgstr "commencé" - -#: 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:63 -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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "Lecture commencée le" @@ -2611,7 +2738,7 @@ msgid "Finish \"%(book_title)s\"" msgstr "Terminer « %(book_title)s »" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 msgid "Update progress" msgstr "Progression de la mise à jour" @@ -2619,20 +2746,20 @@ msgstr "Progression de la mise à jour" 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:11 msgid "Start reading" msgstr "Commencer la lecture" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19 msgid "Finish reading" msgstr "Terminer la lecture" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 #: 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:47 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57 #, python-format msgid "Remove from %(name)s" msgstr "Retirer de %(name)s" @@ -2647,17 +2774,17 @@ msgstr "Commencer « %(book_title)s »" msgid "Want to Read \"%(book_title)s\"" msgstr "Ajouter « %(book_title)s » aux envies de lecture" -#: bookwyrm/templates/snippets/status/content_status.html:71 +#: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" msgstr "Déplier" -#: bookwyrm/templates/snippets/status/content_status.html:86 +#: bookwyrm/templates/snippets/status/content_status.html:87 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" msgstr "Replier" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:117 msgid "Open image in new window" msgstr "Ouvrir l’image dans une nouvelle fenêtre" @@ -2680,7 +2807,7 @@ msgstr "Ajouter le statut aux favoris" msgid "boosted" msgstr "a partagé" -#: bookwyrm/templates/snippets/status/status_header.html:45 +#: bookwyrm/templates/snippets/status/status_header.html:46 #, python-format msgid "replied to %(username)s's status" msgstr "a répondu au statut de %(username)s" @@ -2696,10 +2823,31 @@ 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 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:12 msgid "Send direct message" msgstr "Envoyer un message direct" +#: bookwyrm/templates/snippets/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" + +#: bookwyrm/templates/snippets/suggested_users.html:23 +#, 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" + +#: bookwyrm/templates/snippets/suggested_users.html:31 +#: bookwyrm/templates/user/user_preview.html:36 +#, fuzzy +#| msgid "followed you" +msgid "Follows you" +msgstr "vous suit" + #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" msgstr "Changer vers cette édition" @@ -2712,15 +2860,15 @@ msgstr "Trié par ordre croissant" msgid "Sorted descending" msgstr "Trié par ordre décroissant" -#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 +#: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Profil" -#: bookwyrm/templates/user/layout.html:37 +#: bookwyrm/templates/user/layout.html:44 msgid "Follow Requests" msgstr "Demandes d’abonnement" -#: bookwyrm/templates/user/layout.html:62 +#: bookwyrm/templates/user/layout.html:69 msgid "Reading Goal" msgstr "Défi lecture" @@ -2826,30 +2974,37 @@ msgstr "Flux RSS" msgid "No activities yet!" msgstr "Aucune activité pour l’instant !" -#: bookwyrm/templates/user/user_preview.html:15 +#: bookwyrm/templates/user/user_preview.html:22 #, python-format msgid "Joined %(date)s" msgstr "A rejoint ce serveur %(date)s" -#: bookwyrm/templates/user/user_preview.html:19 +#: bookwyrm/templates/user/user_preview.html:26 #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" msgstr[0] "%(counter)s abonné(e)" msgstr[1] "%(counter)s abonné(e)s" -#: bookwyrm/templates/user/user_preview.html:20 +#: bookwyrm/templates/user/user_preview.html:27 #, python-format msgid "%(counter)s following" msgstr "%(counter)s abonnements" -#: bookwyrm/templates/user/user_preview.html:26 +#: bookwyrm/templates/user/user_preview.html:34 #, 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" +#: bookwyrm/templates/user/user_preview.html:38 +#, fuzzy +#| msgid "follower you follow" +#| msgid_plural "followers you follow" +msgid "No followers you follow" +msgstr "compte que vous suivez" + #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" msgstr "Retour aux comptes" @@ -2905,15 +3060,19 @@ msgstr "Détails de l’instance" msgid "View instance" msgstr "Voir l’instance" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:11 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:5 +msgid "Permanently deleted" +msgstr "" + +#: bookwyrm/templates/user_admin/user_moderation_actions.html:17 msgid "Suspend user" msgstr "Suspendre le compte" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:13 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:19 msgid "Un-suspend user" msgstr "Rétablir le compte" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:21 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:28 msgid "Access level:" msgstr "Niveau d’accès :" @@ -2926,6 +3085,10 @@ msgstr "Ce fichier dépasse la taille limite : 10 Mo" msgid "%(title)s: %(subtitle)s" msgstr "%(title)s (%(subtitle)s)" +#: bookwyrm/views/authentication.py:69 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "Fichier CSV non valide" @@ -2939,6 +3102,15 @@ 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 "Local Timeline" +#~ msgstr "Fil d’actualité local" + +#~ msgid "Federated Timeline" +#~ msgstr "Fil d’actualité des instances fédérées" + +#~ msgid "Local" +#~ msgstr "Local" + #, fuzzy #~| msgid "BookWyrm users" #~ msgid "BookWyrm\\" @@ -2964,11 +3136,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ 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." diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index 78797d29e..664503339 100644 Binary files a/locale/zh_Hans/LC_MESSAGES/django.mo and b/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index c40e716c8..adb0d36c6 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-06 20:52+0000\n" +"POT-Creation-Date: 2021-08-07 01:35+0000\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -18,99 +18,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:224 +#: bookwyrm/forms.py:232 msgid "A user with this email already exists." msgstr "已经存在使用该邮箱的用户。" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:246 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:239 +#: bookwyrm/forms.py:247 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:240 +#: bookwyrm/forms.py:248 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:241 +#: bookwyrm/forms.py:249 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:254 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:257 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:299 +#: bookwyrm/forms.py:307 msgid "List Order" msgstr "列表顺序" -#: bookwyrm/forms.py:300 +#: bookwyrm/forms.py:308 msgid "Book Title" msgstr "书名" -#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 +#: bookwyrm/forms.py:309 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 "评价" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:315 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:316 msgid "Descending" msgstr "降序" -#: bookwyrm/models/fields.py:25 +#: bookwyrm/models/fields.py:27 #, 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:43 +#: bookwyrm/models/fields.py:36 bookwyrm/models/fields.py:45 #, python-format msgid "%(value)s is not a valid username" msgstr "%(value)s 不是有效的用户名" -#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 +#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159 msgid "username" msgstr "用户名" -#: bookwyrm/models/fields.py:171 +#: bookwyrm/models/fields.py:179 msgid "A user with that username already exists." msgstr "已经存在使用该用户名的用户。" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:123 +msgid "Home Timeline" +msgstr "主页时间线" + +#: bookwyrm/settings.py:123 +msgid "Home" +msgstr "主页" + +#: bookwyrm/settings.py:124 +#, fuzzy +#| msgid "Book Title" +msgid "Books Timeline" +msgstr "书名" + +#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/templates/search/layout.html:42 +#: bookwyrm/templates/user/layout.html:81 +msgid "Books" +msgstr "书目" + +#: bookwyrm/settings.py:170 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:171 msgid "German" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:172 msgid "Spanish" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:173 msgid "French" msgstr "Français（法语）" -#: bookwyrm/settings.py:160 +#: bookwyrm/settings.py:174 msgid "Simplified Chinese" msgstr "简体中文" +#: bookwyrm/settings.py:175 +msgid "Traditional Chinese" +msgstr "繁體中文（繁体中文）" + #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" msgstr "未找到" @@ -136,34 +160,42 @@ msgstr "某些东西出错了！对不起啦。" msgid "Edit Author" msgstr "编辑作者" -#: bookwyrm/templates/author/author.html:32 -#: bookwyrm/templates/author/edit_author.html:38 +#: bookwyrm/templates/author/author.html:34 +#: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" msgstr "别名:" -#: bookwyrm/templates/author/author.html:38 +#: bookwyrm/templates/author/author.html:45 msgid "Born:" msgstr "出生:" -#: bookwyrm/templates/author/author.html:44 +#: bookwyrm/templates/author/author.html:52 msgid "Died:" msgstr "逝世:" -#: bookwyrm/templates/author/author.html:51 +#: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" msgstr "维基百科" -#: bookwyrm/templates/author/author.html:55 -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/author/author.html:69 +#: bookwyrm/templates/book/book.html:95 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 查看" -#: bookwyrm/templates/author/author.html:60 -#: bookwyrm/templates/book/book.html:81 +#: bookwyrm/templates/author/author.html:77 +#: bookwyrm/templates/book/book.html:98 msgid "View on Inventaire" msgstr "在 Inventaire 查看" -#: bookwyrm/templates/author/author.html:74 +#: bookwyrm/templates/author/author.html:85 +msgid "View on LibraryThing" +msgstr "在 LibraryThing 查看" + +#: bookwyrm/templates/author/author.html:93 +msgid "View on Goodreads" +msgstr "在 Goodreads 查看" + +#: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" msgstr "%(name)s 所著的书" @@ -173,212 +205,212 @@ msgid "Edit Author:" msgstr "编辑作者:" #: bookwyrm/templates/author/edit_author.html:13 -#: bookwyrm/templates/book/edit_book.html:18 +#: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" msgstr "添加了:" #: bookwyrm/templates/author/edit_author.html:14 -#: bookwyrm/templates/book/edit_book.html:19 +#: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" msgstr "更新了:" #: 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 "最后编辑人:" #: bookwyrm/templates/author/edit_author.html:31 -#: bookwyrm/templates/book/edit_book.html:90 +#: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" msgstr "元数据" -#: 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 "名称:" -#: 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 "请用英文逗号(,)分隔多个值。" -#: bookwyrm/templates/author/edit_author.html:46 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "简介:" -#: bookwyrm/templates/author/edit_author.html:51 +#: bookwyrm/templates/author/edit_author.html:57 msgid "Wikipedia link:" msgstr "维基百科链接:" -#: bookwyrm/templates/author/edit_author.html:57 +#: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" msgstr "出生日期:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" msgstr "死亡日期:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" msgstr "作者标识号:" -#: bookwyrm/templates/author/edit_author.html:74 +#: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" msgstr "Openlibrary key:" -#: 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 "Inventaire ID:" -#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "Librarything key:" -#: bookwyrm/templates/author/edit_author.html:89 +#: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" msgstr "Goodreads key:" -#: bookwyrm/templates/author/edit_author.html:98 -#: bookwyrm/templates/book/book.html:124 -#: bookwyrm/templates/book/edit_book.html:263 +#: bookwyrm/templates/author/edit_author.html:116 +#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/edit_book.html:321 +#: bookwyrm/templates/book/readthrough.html:77 #: bookwyrm/templates/lists/form.html:42 -#: bookwyrm/templates/preferences/edit_user.html:70 +#: bookwyrm/templates/preferences/edit_user.html:78 #: 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/snippets/readthrough.html:77 +#: bookwyrm/templates/settings/site.html:108 #: 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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "保存" -#: bookwyrm/templates/author/edit_author.html:99 -#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 +#: bookwyrm/templates/author/edit_author.html:117 +#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:264 +#: bookwyrm/templates/book/edit_book.html:322 +#: bookwyrm/templates/book/readthrough.html:78 #: bookwyrm/templates/moderation/report_modal.html:34 #: 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 #: 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/start_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book/book.html:31 +#: bookwyrm/templates/book/book.html:48 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" msgstr "作者" -#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 +#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 msgid "Edit Book" msgstr "编辑书目" -#: bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:74 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "添加封面" -#: bookwyrm/templates/book/book.html:61 +#: bookwyrm/templates/book/book.html:78 msgid "Failed to load cover" msgstr "加载封面失败" -#: bookwyrm/templates/book/book.html:101 +#: bookwyrm/templates/book/book.html:118 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 则书评)" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:130 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book/book.html:120 -#: bookwyrm/templates/book/edit_book.html:108 +#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:134 +#: bookwyrm/templates/book/book.html:151 #, python-format msgid "%(count)s editions" msgstr "%(count)s 个版本" -#: bookwyrm/templates/book/book.html:142 +#: bookwyrm/templates/book/book.html:159 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "此版本在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:165 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "本书的 另一个版本 在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:176 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book/book.html:162 +#: bookwyrm/templates/book/book.html:179 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book/book.html:171 +#: bookwyrm/templates/book/book.html:188 msgid "Create" msgstr "创建" -#: bookwyrm/templates/book/book.html:181 +#: bookwyrm/templates/book/book.html:198 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book/book.html:200 +#: bookwyrm/templates/book/book.html:217 msgid "Reviews" msgstr "书评" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:222 msgid "Your reviews" msgstr "你的书评" -#: bookwyrm/templates/book/book.html:211 +#: bookwyrm/templates/book/book.html:228 msgid "Your comments" msgstr "你的评论" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:234 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:253 +#: bookwyrm/templates/book/book.html:270 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:282 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 #: 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:68 +#: bookwyrm/templates/user/layout.html:75 msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:304 msgid "Add to list" msgstr "添加到列表" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:314 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -389,22 +421,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 "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 "上传封面:" #: 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 "从网址加载封面:" @@ -419,127 +451,132 @@ msgstr "编辑 \"%(book_title)s\"" msgid "Add Book" msgstr "添加书目" -#: bookwyrm/templates/book/edit_book.html:40 +#: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" msgstr "确认书目信息" -#: bookwyrm/templates/book/edit_book.html:47 +#: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" msgstr "\"%(name)s\" 是已存在的作者吗？" -#: bookwyrm/templates/book/edit_book.html:52 +#: bookwyrm/templates/book/edit_book.html:71 #, python-format msgid "Author of %(book_title)s" msgstr "%(book_title)s 的作者" -#: bookwyrm/templates/book/edit_book.html:55 +#: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" msgstr "这是一位新的作者" -#: bookwyrm/templates/book/edit_book.html:61 +#: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" msgstr "正在创建新的作者: %(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 "这是已存在的作品的一个版本吗？" -#: bookwyrm/templates/book/edit_book.html:71 +#: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" msgstr "这是一个新的作品。" -#: bookwyrm/templates/book/edit_book.html:77 +#: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" msgstr "确认" -#: bookwyrm/templates/book/edit_book.html:79 +#: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" msgstr "返回" -#: bookwyrm/templates/book/edit_book.html:93 +#: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" msgstr "标题:" -#: bookwyrm/templates/book/edit_book.html:101 +#: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" msgstr "副标题:" -#: bookwyrm/templates/book/edit_book.html:114 +#: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" msgstr "系列:" -#: bookwyrm/templates/book/edit_book.html:122 +#: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" msgstr "系列编号:" -#: bookwyrm/templates/book/edit_book.html:130 +#: bookwyrm/templates/book/edit_book.html:160 msgid "Languages:" msgstr "语言:" -#: bookwyrm/templates/book/edit_book.html:139 +#: bookwyrm/templates/book/edit_book.html:169 msgid "Publisher:" msgstr "出版社:" -#: bookwyrm/templates/book/edit_book.html:148 +#: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" msgstr "初版时间:" -#: bookwyrm/templates/book/edit_book.html:156 +#: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" msgstr "出版时间:" -#: bookwyrm/templates/book/edit_book.html:165 +#: bookwyrm/templates/book/edit_book.html:195 msgid "Authors" msgstr "作者" -#: bookwyrm/templates/book/edit_book.html:171 +#: bookwyrm/templates/book/edit_book.html:202 #, python-format -msgid "Remove %(name)s" -msgstr "移除 %(name)s" +msgid "Remove %(name)s" +msgstr "移除 %(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 "%(name)s 的作者页面" + +#: bookwyrm/templates/book/edit_book.html:212 msgid "Add Authors:" msgstr "添加作者:" -#: bookwyrm/templates/book/edit_book.html:177 +#: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" msgstr "张三, 李四" -#: bookwyrm/templates/book/edit_book.html:183 +#: bookwyrm/templates/book/edit_book.html:220 #: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" msgstr "封面" -#: bookwyrm/templates/book/edit_book.html:211 +#: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" msgstr "实体性质" -#: bookwyrm/templates/book/edit_book.html:212 +#: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit_book.html:220 +#: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" msgstr "页数:" -#: bookwyrm/templates/book/edit_book.html:227 +#: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" msgstr "书目标识号" -#: 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 "Openlibrary ID:" @@ -585,7 +622,7 @@ msgstr "%(languages)s 语言" #: bookwyrm/templates/book/publisher_info.html:64 #, python-format msgid "Published %(date)s by %(publisher)s." -msgstr "在 %(date)s 由 %(publisher)s 出版。" +msgstr "%(publisher)s 于 %(date)s 出版。" #: bookwyrm/templates/book/publisher_info.html:66 #, python-format @@ -595,17 +632,46 @@ msgstr "于 %(date)s 出版" #: bookwyrm/templates/book/publisher_info.html:68 #, python-format msgid "Published by %(publisher)s." -msgstr "由 %(publisher)s 出版。" +msgstr "%(publisher)s 出版。" #: bookwyrm/templates/book/rating.html:13 msgid "rated it" msgstr "评价了" +#: bookwyrm/templates/book/readthrough.html:8 +msgid "Progress Updates:" +msgstr "进度更新:" + +#: bookwyrm/templates/book/readthrough.html:14 +msgid "finished" +msgstr "已完成" + +#: bookwyrm/templates/book/readthrough.html:25 +msgid "Show all updates" +msgstr "显示所有更新" + +#: bookwyrm/templates/book/readthrough.html:41 +msgid "Delete this progress update" +msgstr "删除此进度更新" + +#: bookwyrm/templates/book/readthrough.html:52 +msgid "started" +msgstr "已开始" + +#: bookwyrm/templates/book/readthrough.html:59 +#: bookwyrm/templates/book/readthrough.html:73 +msgid "Edit read dates" +msgstr "编辑阅读日期" + +#: bookwyrm/templates/book/readthrough.html:63 +msgid "Delete these read dates" +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/feed/layout.html:71 +#: bookwyrm/templates/get_started/layout.html:20 +#: bookwyrm/templates/get_started/layout.html:53 #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" @@ -615,6 +681,60 @@ msgstr "关闭" msgid "Compose status" msgstr "撰写状态" +#: bookwyrm/templates/confirm_email/confirm_email.html:4 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm email" +msgstr "确认" + +#: bookwyrm/templates/confirm_email/confirm_email.html:7 +#, fuzzy +#| msgid "Email address:" +msgid "Confirm your email address" +msgstr "邮箱地址:" + +#: bookwyrm/templates/confirm_email/confirm_email.html:13 +msgid "A confirmation code has been sent to the email address you used to register your account." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:15 +msgid "Sorry! We couldn't find that code." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:19 +#, fuzzy +#| msgid "Confirm password:" +msgid "Confirmation code:" +msgstr "确认密码:" + +#: bookwyrm/templates/confirm_email/confirm_email.html:25 +#: bookwyrm/templates/discover/landing_layout.html:70 +#: bookwyrm/templates/moderation/report_modal.html:33 +msgid "Submit" +msgstr "提交" + +#: bookwyrm/templates/confirm_email/confirm_email.html:32 +msgid "Can't find your code?" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:4 +msgid "Resend confirmation link" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:11 +#: 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/confirm_email/resend_form.html:17 +#, fuzzy +#| msgid "Re-send invite" +msgid "Resend link" +msgstr "重新发送请求" + #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" msgstr "社区" @@ -629,7 +749,7 @@ msgstr "跨站社区" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/layout.html:71 msgid "Directory" msgstr "目录" @@ -660,21 +780,30 @@ msgstr "受推荐" msgid "Recently active" msgstr "最近活跃" -#: bookwyrm/templates/directory/user_card.html:33 +#: bookwyrm/templates/directory/user_card.html:17 +#: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/user/user_preview.html:16 +#: bookwyrm/templates/user/user_preview.html:17 +#, fuzzy +#| msgid "Your Account" +msgid "Locked account" +msgstr "你的帐号" + +#: bookwyrm/templates/directory/user_card.html:40 msgid "follower you follow" msgid_plural "followers you follow" msgstr[0] "你关注的关注者" -#: bookwyrm/templates/directory/user_card.html:40 +#: bookwyrm/templates/directory/user_card.html:47 msgid "book on your shelves" msgid_plural "books on your shelves" msgstr[0] "你书架上的书" -#: bookwyrm/templates/directory/user_card.html:48 +#: bookwyrm/templates/directory/user_card.html:55 msgid "posts" msgstr "发文" -#: bookwyrm/templates/directory/user_card.html:54 +#: bookwyrm/templates/directory/user_card.html:61 msgid "last active" msgstr "最后活跃" @@ -710,7 +839,7 @@ msgid "Recent Books" msgstr "最近书目" #: bookwyrm/templates/discover/landing_layout.html:5 -#: bookwyrm/templates/get_started/layout.html:4 +#: bookwyrm/templates/get_started/layout.html:5 msgid "Welcome" msgstr "欢迎" @@ -732,34 +861,38 @@ msgid "Join %(name)s" msgstr "加入 %(name)s" #: bookwyrm/templates/discover/landing_layout.html:51 -#: bookwyrm/templates/login.html:51 +#: bookwyrm/templates/login.html:56 msgid "This instance is closed" 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 "请求邀请" -#: 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:33 -msgid "Submit" -msgstr "提交" - #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" msgstr "你的帐号" +#: bookwyrm/templates/email/confirm/html_content.html:6 +#: bookwyrm/templates/email/confirm/text_content.html:4 +#, python-format +msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:11 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm Email" +msgstr "确认" + +#: bookwyrm/templates/email/confirm/subject.html:2 +msgid "Please confirm your email" +msgstr "" + #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," @@ -828,7 +961,7 @@ msgid "Direct Messages with %(username)s" msgstr "与 %(username)s 私信" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:99 msgid "Direct Messages" msgstr "私信" @@ -840,91 +973,55 @@ msgstr "所有消息" msgid "You have no messages right now." msgstr "你现在没有消息。" -#: bookwyrm/templates/feed/feed.html:8 -msgid "Home Timeline" -msgstr "主页时间线" - -#: bookwyrm/templates/feed/feed.html:10 -msgid "Local Timeline" -msgstr "本地时间线" - -#: bookwyrm/templates/feed/feed.html:12 -msgid "Federated Timeline" -msgstr "跨站时间线" - -#: bookwyrm/templates/feed/feed.html:18 -msgid "Home" -msgstr "主页" - -#: bookwyrm/templates/feed/feed.html:21 -msgid "Local" -msgstr "本站" - -#: bookwyrm/templates/feed/feed.html:24 -#: bookwyrm/templates/settings/edit_server.html:40 -msgid "Federated" -msgstr "跨站" - -#: bookwyrm/templates/feed/feed.html:32 -#, python-format -msgid "load 0 unread status(es)" +#: bookwyrm/templates/feed/feed.html:22 +#, fuzzy, python-format +#| msgid "load 0 unread status(es)" +msgid "load 0 unread status(es)" msgstr "加载 0 条未读状态" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:38 msgid "There aren't any activities right now! Try following a user to get started" -msgstr "现在还没有任何活动！尝试着从关注一个用户开始吧" +msgstr "现在还没有任何活动！尝试从关注一个用户开始吧" -#: bookwyrm/templates/feed/feed.html:55 -#: bookwyrm/templates/get_started/users.html:6 -msgid "Who to follow" -msgstr "可以关注的人" - -#: bookwyrm/templates/feed/feed_layout.html:4 +#: bookwyrm/templates/feed/layout.html:5 msgid "Updates" msgstr "更新" -#: bookwyrm/templates/feed/feed_layout.html:10 +#: bookwyrm/templates/feed/layout.html:12 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "你的书目" -#: bookwyrm/templates/feed/feed_layout.html:12 +#: bookwyrm/templates/feed/layout.html:14 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/layout.html:25 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "To Read" msgstr "想读" -#: bookwyrm/templates/feed/feed_layout.html:24 +#: bookwyrm/templates/feed/layout.html:26 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Currently Reading" msgstr "在读" -#: bookwyrm/templates/feed/feed_layout.html:25 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 +#: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" msgstr "读过" -#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 +#: bookwyrm/templates/feed/layout.html:90 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/suggested_users.html:16 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -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] "%(shared_books)s 本在你书架上也有的书" +#: bookwyrm/templates/feed/suggested_users.html:3 +#: bookwyrm/templates/get_started/users.html:6 +msgid "Who to follow" +msgstr "可以关注的人" #: bookwyrm/templates/get_started/book_preview.html:6 #, python-format @@ -955,7 +1052,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:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45 #: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 @@ -981,33 +1078,33 @@ msgstr "没有找到书目" msgid "Save & continue" msgstr "保存 & 继续" -#: bookwyrm/templates/get_started/layout.html:14 +#: bookwyrm/templates/get_started/layout.html:15 #, python-format msgid "Welcome to %(site_name)s!" msgstr "欢迎来到 %(site_name)s！" -#: bookwyrm/templates/get_started/layout.html:16 +#: bookwyrm/templates/get_started/layout.html:17 msgid "These are some first steps to get you started." msgstr "这些最初的步骤可以帮助你入门。" -#: bookwyrm/templates/get_started/layout.html:30 +#: bookwyrm/templates/get_started/layout.html:31 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" msgstr "创建你的个人资料" -#: bookwyrm/templates/get_started/layout.html:34 +#: bookwyrm/templates/get_started/layout.html:35 msgid "Add books" msgstr "添加书目" -#: bookwyrm/templates/get_started/layout.html:38 +#: bookwyrm/templates/get_started/layout.html:39 msgid "Find friends" msgstr "寻找同好" -#: bookwyrm/templates/get_started/layout.html:44 +#: bookwyrm/templates/get_started/layout.html:45 msgid "Skip this step" msgstr "跳过此步骤" -#: bookwyrm/templates/get_started/layout.html:48 +#: bookwyrm/templates/get_started/layout.html:49 msgid "Finish" msgstr "完成" @@ -1036,7 +1133,7 @@ msgid "Manually approve followers:" msgstr "手动批准关注者:" #: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:58 +#: bookwyrm/templates/preferences/edit_user.html:66 msgid "Show this account in suggested users:" msgstr "在推荐的用户中显示此帐号:" @@ -1117,75 +1214,88 @@ msgstr "最近的导入" msgid "No recent imports" msgstr "无最近的导入" -#: bookwyrm/templates/import_status.html:5 -#: bookwyrm/templates/import_status.html:9 +#: bookwyrm/templates/import_status.html:6 +#: bookwyrm/templates/import_status.html:10 msgid "Import Status" msgstr "导入状态" -#: bookwyrm/templates/import_status.html:12 +#: bookwyrm/templates/import_status.html:11 +msgid "Back to imports" +msgstr "回到导入" + +#: bookwyrm/templates/import_status.html:15 msgid "Import started:" msgstr "导入开始:" -#: bookwyrm/templates/import_status.html:16 +#: bookwyrm/templates/import_status.html:20 msgid "Import completed:" msgstr "导入完成:" -#: bookwyrm/templates/import_status.html:19 +#: bookwyrm/templates/import_status.html:25 msgid "TASK FAILED" msgstr "任务失败" -#: bookwyrm/templates/import_status.html:25 +#: bookwyrm/templates/import_status.html:32 msgid "Import still in progress." msgstr "还在导入中。" -#: bookwyrm/templates/import_status.html:27 +#: bookwyrm/templates/import_status.html:34 msgid "(Hit reload to update!)" msgstr "（按下重新加载来更新！）" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import_status.html:41 msgid "Failed to load" msgstr "加载失败" -#: bookwyrm/templates/import_status.html:43 +#: bookwyrm/templates/import_status.html:50 #, 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:78 +#: bookwyrm/templates/import_status.html:62 +#, python-format +msgid "Line %(index)s: %(title)s by %(author)s" +msgstr "第 %(index)s 行: %(author)s 所著的 %(title)s" + +#: bookwyrm/templates/import_status.html:82 msgid "Select all" msgstr "全选" -#: bookwyrm/templates/import_status.html:81 +#: bookwyrm/templates/import_status.html:85 msgid "Retry items" msgstr "重试项目" -#: bookwyrm/templates/import_status.html:107 +#: bookwyrm/templates/import_status.html:112 msgid "Successfully imported" msgstr "成功导入了" -#: bookwyrm/templates/import_status.html:111 +#: bookwyrm/templates/import_status.html:114 +msgid "Import Progress" +msgstr "导入进度" + +#: bookwyrm/templates/import_status.html:119 msgid "Book" msgstr "书目" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import_status.html:122 #: 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 "标题" -#: bookwyrm/templates/import_status.html:117 +#: bookwyrm/templates/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" msgstr "作者" -#: bookwyrm/templates/import_status.html:140 +#: bookwyrm/templates/import_status.html:148 msgid "Imported" msgstr "已导入" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 -#: bookwyrm/templates/login.html:46 +#: bookwyrm/templates/login.html:51 msgid "Create an Account" msgstr "创建帐号" @@ -1210,27 +1320,27 @@ msgstr "\"%(query)s\" 的搜索结果" msgid "Matching Books" msgstr "匹配的书目" -#: bookwyrm/templates/layout.html:33 +#: bookwyrm/templates/layout.html:40 msgid "Search for a book or user" msgstr "搜索书目或用户" -#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 +#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 msgid "Main navigation menu" msgstr "主导航菜单" -#: bookwyrm/templates/layout.html:58 +#: bookwyrm/templates/layout.html:65 msgid "Feed" msgstr "动态" -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:94 msgid "Your Books" msgstr "你的书目" -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/layout.html:104 msgid "Settings" msgstr "设置" -#: bookwyrm/templates/layout.html:106 +#: bookwyrm/templates/layout.html:113 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1238,61 +1348,61 @@ msgstr "设置" msgid "Invites" msgstr "邀请" -#: bookwyrm/templates/layout.html:113 +#: bookwyrm/templates/layout.html:120 msgid "Admin" msgstr "管理员" -#: bookwyrm/templates/layout.html:120 +#: bookwyrm/templates/layout.html:127 msgid "Log out" msgstr "登出" -#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 +#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "通知" -#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 -#: bookwyrm/templates/login.html:17 +#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162 +#: bookwyrm/templates/login.html:22 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "用户名:" -#: bookwyrm/templates/layout.html:156 +#: bookwyrm/templates/layout.html:163 msgid "password" msgstr "密码" -#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41 msgid "Forgot your password?" msgstr "忘记了密码？" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 -#: bookwyrm/templates/login.html:33 +#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/login.html:38 msgid "Log in" msgstr "登录" -#: bookwyrm/templates/layout.html:168 +#: bookwyrm/templates/layout.html:175 msgid "Join" msgstr "加入" -#: bookwyrm/templates/layout.html:206 +#: bookwyrm/templates/layout.html:213 msgid "About this instance" msgstr "关于本实例" -#: bookwyrm/templates/layout.html:210 +#: bookwyrm/templates/layout.html:217 msgid "Contact site admin" msgstr "联系站点管理员" -#: bookwyrm/templates/layout.html:214 +#: bookwyrm/templates/layout.html:221 msgid "Documentation" msgstr "文档:" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:228 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "在 %(support_title)s 上支持 %(site_name)s" -#: bookwyrm/templates/layout.html:225 +#: bookwyrm/templates/layout.html:232 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "BookWyrm 是开源软件。你可以在 GitHub 贡献或报告问题。" @@ -1443,18 +1553,22 @@ msgstr "你的列表" msgid "Login" msgstr "登录" -#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 +#: bookwyrm/templates/login.html:16 +msgid "Success! Email address confirmed." +msgstr "" + +#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" msgstr "密码:" -#: bookwyrm/templates/login.html:52 +#: bookwyrm/templates/login.html:57 msgid "Contact an administrator to get an invite" msgstr "联系管理员以取得邀请" -#: bookwyrm/templates/login.html:63 +#: bookwyrm/templates/login.html:68 msgid "More about this site" -msgstr "关于本站点的更多" +msgstr "更多关于本站点的信息" #: bookwyrm/templates/moderation/report.html:5 #: bookwyrm/templates/moderation/report.html:6 @@ -1670,6 +1784,7 @@ msgstr "你什么也没错过！" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "确认密码:" @@ -1683,7 +1798,7 @@ msgstr "重设密码" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/preferences_layout.html:26 +#: bookwyrm/templates/preferences/layout.html:30 msgid "Blocked Users" msgstr "屏蔽的用户" @@ -1694,7 +1809,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:19 +#: bookwyrm/templates/preferences/layout.html:19 msgid "Change Password" msgstr "更改密码" @@ -1702,6 +1817,21 @@ msgstr "更改密码" msgid "New password:" msgstr "新密码:" +#: bookwyrm/templates/preferences/delete_user.html:4 +#: bookwyrm/templates/preferences/delete_user.html:7 +#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/layout.html:23 +msgid "Delete Account" +msgstr "删除帐号" + +#: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Permanently delete account" +msgstr "永久删除帐号" + +#: bookwyrm/templates/preferences/delete_user.html:14 +msgid "Deleting your account cannot be undone. The username will not be available to register in the future." +msgstr "删除帐号的操作将无法被撤销。对应用户名也无法被再次注册。" + #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" @@ -1711,44 +1841,65 @@ msgstr "编辑个人资料" msgid "Show set reading goal prompt in feed:" msgstr "在消息流中显示设置阅读目标的提示:" -#: bookwyrm/templates/preferences/edit_user.html:62 +#: bookwyrm/templates/preferences/edit_user.html:58 +#, fuzzy +#| msgid "Post privacy" +msgid "Default post privacy:" +msgstr "发文隐私" + +#: bookwyrm/templates/preferences/edit_user.html:70 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "你的帐号会显示在 目录 中，并可能受其它 BookWyrm 用户推荐。" -#: bookwyrm/templates/preferences/edit_user.html:65 +#: bookwyrm/templates/preferences/edit_user.html:73 msgid "Preferred Timezone: " msgstr "偏好的时区:" -#: bookwyrm/templates/preferences/preferences_layout.html:11 +#: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "帐号" -#: bookwyrm/templates/preferences/preferences_layout.html:15 +#: bookwyrm/templates/preferences/layout.html:15 msgid "Profile" msgstr "个人资料" -#: bookwyrm/templates/preferences/preferences_layout.html:22 +#: bookwyrm/templates/preferences/layout.html:26 msgid "Relationships" msgstr "关系" +#: bookwyrm/templates/reading_progress/finish.html:5 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "完成 \"%(book_title)s\"" + +#: bookwyrm/templates/reading_progress/start.html:5 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "开始 \"%(book_title)s\"" + +#: bookwyrm/templates/reading_progress/want.html:5 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "想要阅读 \"%(book_title)s\"" + #: bookwyrm/templates/rss/title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 +#: bookwyrm/templates/snippets/status/status_header.html:36 msgid "rated" msgstr "评价了" #: bookwyrm/templates/rss/title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 +#: bookwyrm/templates/snippets/status/status_header.html:38 msgid "reviewed" msgstr "写了书评给" #: bookwyrm/templates/rss/title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 +#: bookwyrm/templates/snippets/status/status_header.html:40 msgid "commented on" msgstr "评论了" #: bookwyrm/templates/rss/title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 +#: bookwyrm/templates/snippets/status/status_header.html:42 msgid "quoted" msgstr "引用了" @@ -1772,12 +1923,6 @@ msgstr "搜索请求" msgid "Search type" msgstr "搜索类型" -#: bookwyrm/templates/search/layout.html:21 -#: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:74 -msgid "Books" -msgstr "书目" - #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 #: bookwyrm/templates/settings/admin_layout.html:26 @@ -1953,6 +2098,10 @@ msgstr "实例:" msgid "Status:" msgstr "状态:" +#: bookwyrm/templates/settings/edit_server.html:40 +msgid "Federated" +msgstr "跨站" + #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 msgid "Blocked" @@ -1979,7 +2128,7 @@ msgid "Details" msgstr "详细" #: bookwyrm/templates/settings/federated_server.html:39 -#: bookwyrm/templates/user/layout.html:56 +#: bookwyrm/templates/user/layout.html:63 msgid "Activity" msgstr "活动" @@ -2018,7 +2167,7 @@ msgid "Edit" msgstr "编辑" #: bookwyrm/templates/settings/federated_server.html:105 -#: bookwyrm/templates/user_admin/user_moderation_actions.html:3 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:8 msgid "Actions" msgstr "动作" @@ -2224,15 +2373,23 @@ msgstr "管理员邮件:" msgid "Additional info:" msgstr "附加信息:" -#: bookwyrm/templates/settings/site.html:83 -msgid "Allow registration:" -msgstr "允许注册:" - -#: bookwyrm/templates/settings/site.html:87 -msgid "Allow invite requests:" -msgstr "允许请求邀请:" +#: bookwyrm/templates/settings/site.html:85 +msgid "Allow registration" +msgstr "允许注册" #: bookwyrm/templates/settings/site.html:91 +msgid "Allow invite requests" +msgstr "允许请求邀请" + +#: bookwyrm/templates/settings/site.html:97 +msgid "Require users to confirm email address" +msgstr "" + +#: bookwyrm/templates/settings/site.html:99 +msgid "(Recommended if registration is open)" +msgstr "" + +#: bookwyrm/templates/settings/site.html:102 msgid "Registration closed text:" msgstr "注册关闭文字:" @@ -2241,13 +2398,20 @@ msgstr "注册关闭文字:" msgid "Posted by %(username)s" msgstr "由 %(username)s 发布" -#: bookwyrm/templates/snippets/book_cover.html:31 +#: bookwyrm/templates/snippets/authors.html:22 +#, python-format +msgid "and %(remainder_count_display)s other" +msgid_plural "and %(remainder_count_display)s others" +msgstr[0] "" + +#: bookwyrm/templates/snippets/book_cover.html:32 msgid "No cover" msgstr "没有封面" -#: bookwyrm/templates/snippets/book_titleby.html:4 -#, python-format -msgid "%(title)s by " +#: bookwyrm/templates/snippets/book_titleby.html:6 +#, fuzzy, python-format +#| msgid "%(title)s by " +msgid "%(title)s by" msgstr "%(title)s 来自" #: bookwyrm/templates/snippets/boost_button.html:20 @@ -2329,7 +2493,7 @@ 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 +#: bookwyrm/templates/snippets/privacy_select.html:20 msgid "Private" msgstr "私密" @@ -2442,7 +2606,7 @@ 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/start_reading_modal.html:31 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" msgstr "发布到消息流中" @@ -2486,13 +2650,13 @@ msgstr "往后" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 -#: bookwyrm/templates/snippets/privacy_select.html:10 +#: bookwyrm/templates/snippets/privacy_select.html:11 msgid "Public" msgstr "公开" #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 -#: bookwyrm/templates/snippets/privacy_select.html:13 +#: bookwyrm/templates/snippets/privacy_select.html:14 msgid "Unlisted" msgstr "不公开" @@ -2504,7 +2668,7 @@ msgstr "仅关注者" msgid "Post privacy" msgstr "发文隐私" -#: bookwyrm/templates/snippets/privacy_select.html:16 +#: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" @@ -2518,38 +2682,9 @@ msgstr "留下评价" msgid "Rate" msgstr "评价" -#: bookwyrm/templates/snippets/readthrough.html:8 -msgid "Progress Updates:" -msgstr "进度更新:" - -#: bookwyrm/templates/snippets/readthrough.html:14 -msgid "finished" -msgstr "已完成" - -#: bookwyrm/templates/snippets/readthrough.html:25 -msgid "Show all updates" -msgstr "显示所有更新" - -#: bookwyrm/templates/snippets/readthrough.html:41 -msgid "Delete this progress update" -msgstr "删除此进度更新" - -#: bookwyrm/templates/snippets/readthrough.html:52 -msgid "started" -msgstr "已开始" - -#: bookwyrm/templates/snippets/readthrough.html:59 -#: bookwyrm/templates/snippets/readthrough.html:73 -msgid "Edit read dates" -msgstr "编辑阅读日期" - -#: bookwyrm/templates/snippets/readthrough.html:63 -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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "已开始阅读" @@ -2584,7 +2719,7 @@ msgid "Finish \"%(book_title)s\"" msgstr "完成 \"%(book_title)s\"" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 msgid "Update progress" msgstr "更新进度" @@ -2592,20 +2727,20 @@ msgstr "更新进度" msgid "More shelves" msgstr "更多书架" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11 msgid "Start reading" msgstr "开始阅读" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19 msgid "Finish reading" msgstr "完成阅读" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 #: 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:47 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57 #, python-format msgid "Remove from %(name)s" msgstr "从 %(name)s 移除" @@ -2620,17 +2755,17 @@ msgstr "开始 \"%(book_title)s\"" msgid "Want to Read \"%(book_title)s\"" msgstr "想要阅读 \"%(book_title)s\"" -#: bookwyrm/templates/snippets/status/content_status.html:71 +#: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" msgstr "显示更多" -#: bookwyrm/templates/snippets/status/content_status.html:86 +#: bookwyrm/templates/snippets/status/content_status.html:87 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" msgstr "显示更少" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:117 msgid "Open image in new window" msgstr "在新窗口中打开图像" @@ -2653,7 +2788,7 @@ msgstr "喜欢状态" msgid "boosted" msgstr "转发了" -#: bookwyrm/templates/snippets/status/status_header.html:45 +#: bookwyrm/templates/snippets/status/status_header.html:46 #, python-format msgid "replied to %(username)s's status" msgstr "回复了 %(username)s 的 状态" @@ -2669,10 +2804,29 @@ 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 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:12 msgid "Send direct message" msgstr "发送私信" +#: bookwyrm/templates/snippets/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "%(mutuals)s 个你也关注的关注者" + +#: bookwyrm/templates/snippets/suggested_users.html:23 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "%(shared_books)s 本在你书架上也有的书" + +#: bookwyrm/templates/snippets/suggested_users.html:31 +#: bookwyrm/templates/user/user_preview.html:36 +#, fuzzy +#| msgid "followed you" +msgid "Follows you" +msgstr "关注了你" + #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" msgstr "切换到此版本" @@ -2685,15 +2839,15 @@ msgstr "升序排序" msgid "Sorted descending" msgstr "降序排序" -#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 +#: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "用户个人资料" -#: bookwyrm/templates/user/layout.html:37 +#: bookwyrm/templates/user/layout.html:44 msgid "Follow Requests" msgstr "关注请求" -#: bookwyrm/templates/user/layout.html:62 +#: bookwyrm/templates/user/layout.html:69 msgid "Reading Goal" msgstr "阅读目标" @@ -2799,28 +2953,35 @@ msgstr "RSS 流" msgid "No activities yet!" msgstr "还没有活动！" -#: bookwyrm/templates/user/user_preview.html:15 +#: bookwyrm/templates/user/user_preview.html:22 #, python-format msgid "Joined %(date)s" msgstr "在 %(date)s 加入" -#: bookwyrm/templates/user/user_preview.html:19 +#: bookwyrm/templates/user/user_preview.html:26 #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" msgstr[0] "%(counter)s 个关注者" -#: bookwyrm/templates/user/user_preview.html:20 +#: bookwyrm/templates/user/user_preview.html:27 #, python-format msgid "%(counter)s following" msgstr "关注着 %(counter)s 人" -#: bookwyrm/templates/user/user_preview.html:26 +#: bookwyrm/templates/user/user_preview.html:34 #, python-format msgid "%(mutuals_display)s follower you follow" msgid_plural "%(mutuals_display)s followers you follow" msgstr[0] "%(mutuals_display)s 个你也关注的关注者" +#: bookwyrm/templates/user/user_preview.html:38 +#, fuzzy +#| msgid "follower you follow" +#| msgid_plural "followers you follow" +msgid "No followers you follow" +msgstr "你关注的关注者" + #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" msgstr "回到用户" @@ -2876,22 +3037,35 @@ msgstr "实例详情" msgid "View instance" msgstr "查看实例" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:11 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:5 +msgid "Permanently deleted" +msgstr "已永久删除" + +#: bookwyrm/templates/user_admin/user_moderation_actions.html:17 msgid "Suspend user" msgstr "停用用户" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:13 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:19 msgid "Un-suspend user" msgstr "取消停用用户" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:21 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:28 msgid "Access level:" msgstr "访问级别:" -#: 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 "文件超过了最大大小: 10MB" +#: bookwyrm/templatetags/utilities.py:30 +#, python-format +msgid "%(title)s: %(subtitle)s" +msgstr "%(title)s：%(subtitle)s" + +#: bookwyrm/views/authentication.py:69 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "不是有效的 csv 文件" @@ -2905,3 +3079,11 @@ msgstr "没有找到使用该邮箱的用户。" msgid "A password reset link sent to %s" msgstr "密码重置连接已发送给 %s" +#~ msgid "Local Timeline" +#~ msgstr "本地时间线" + +#~ msgid "Federated Timeline" +#~ msgstr "跨站时间线" + +#~ msgid "Local" +#~ msgstr "本站" diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo new file mode 100644 index 000000000..552fea2a6 Binary files /dev/null and b/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index e11f024b7..c496bb924 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/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-30 10:36+0000\n" +"POT-Creation-Date: 2021-08-07 01:35+0000\n" "PO-Revision-Date: 2021-06-30 10:36+0000\n" "Last-Translator: Grace Cheng \n" "Language-Team: LANGUAGE \n" @@ -18,101 +18,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:224 +#: bookwyrm/forms.py:232 msgid "A user with this email already exists." msgstr "已經存在使用該郵箱的使用者。" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:246 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:239 +#: bookwyrm/forms.py:247 msgid "One Week" msgstr "一週" -#: bookwyrm/forms.py:240 +#: bookwyrm/forms.py:248 msgid "One Month" msgstr "一個月" -#: bookwyrm/forms.py:241 +#: bookwyrm/forms.py:249 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:254 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:257 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:299 +#: bookwyrm/forms.py:307 msgid "List Order" msgstr "列表順序" -#: bookwyrm/forms.py:300 +#: bookwyrm/forms.py:308 msgid "Book Title" msgstr "書名" -#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 +#: bookwyrm/forms.py:309 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 "評價" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:315 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:316 msgid "Descending" msgstr "降序" -#: bookwyrm/models/fields.py:25 +#: bookwyrm/models/fields.py:27 #, 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:43 +#: bookwyrm/models/fields.py:36 bookwyrm/models/fields.py:45 #, python-format msgid "%(value)s is not a valid username" msgstr "%(value)s 不是有效的使用者名稱" -#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 +#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:159 msgid "username" msgstr "使用者名稱" -#: bookwyrm/models/fields.py:171 +#: bookwyrm/models/fields.py:179 msgid "A user with that username already exists." msgstr "已經存在使用該名稱的使用者。" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:123 +msgid "Home Timeline" +msgstr "主頁時間線" + +#: bookwyrm/settings.py:123 +msgid "Home" +msgstr "主頁" + +#: bookwyrm/settings.py:124 +#, fuzzy +#| msgid "Book Title" +msgid "Books Timeline" +msgstr "書名" + +#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/templates/search/layout.html:42 +#: bookwyrm/templates/user/layout.html:81 +msgid "Books" +msgstr "書目" + +#: bookwyrm/settings.py:170 msgid "English" msgstr "English（英語）" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:171 msgid "German" msgstr "Deutsch（德語）" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:172 msgid "Spanish" msgstr "Español（西班牙語）" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:173 msgid "French" msgstr "Français（法語）" -#: bookwyrm/settings.py:160 +#: bookwyrm/settings.py:174 msgid "Simplified Chinese" msgstr "簡體中文" -#: bookwyrm/settings.py:161 -msgid "Tranditional Chinese" +#: bookwyrm/settings.py:175 +#, fuzzy +#| msgid "Tranditional Chinese" +msgid "Traditional Chinese" msgstr "繁體中文" #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 @@ -140,34 +162,44 @@ msgstr "某些東西出錯了！抱歉。" msgid "Edit Author" msgstr "編輯作者" -#: bookwyrm/templates/author/author.html:32 -#: bookwyrm/templates/author/edit_author.html:38 +#: bookwyrm/templates/author/author.html:34 +#: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" msgstr "別名:" -#: bookwyrm/templates/author/author.html:38 +#: bookwyrm/templates/author/author.html:45 msgid "Born:" msgstr "出生:" -#: bookwyrm/templates/author/author.html:44 +#: bookwyrm/templates/author/author.html:52 msgid "Died:" msgstr "逝世:" -#: bookwyrm/templates/author/author.html:51 +#: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" msgstr "維基百科" -#: bookwyrm/templates/author/author.html:55 -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/author/author.html:69 +#: bookwyrm/templates/book/book.html:95 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 檢視" -#: bookwyrm/templates/author/author.html:60 -#: bookwyrm/templates/book/book.html:81 +#: bookwyrm/templates/author/author.html:77 +#: bookwyrm/templates/book/book.html:98 msgid "View on Inventaire" msgstr "在 Inventaire 檢視" -#: bookwyrm/templates/author/author.html:74 +#: bookwyrm/templates/author/author.html:85 +#, fuzzy +#| msgid "View on OpenLibrary" +msgid "View on LibraryThing" +msgstr "在 OpenLibrary 檢視" + +#: bookwyrm/templates/author/author.html:93 +msgid "View on Goodreads" +msgstr "" + +#: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" msgstr "%(name)s 所著的書" @@ -177,212 +209,212 @@ msgid "Edit Author:" msgstr "編輯作者:" #: bookwyrm/templates/author/edit_author.html:13 -#: bookwyrm/templates/book/edit_book.html:18 +#: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" msgstr "新增了:" #: bookwyrm/templates/author/edit_author.html:14 -#: bookwyrm/templates/book/edit_book.html:19 +#: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" msgstr "更新了:" #: 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 "最後編輯者:" #: bookwyrm/templates/author/edit_author.html:31 -#: bookwyrm/templates/book/edit_book.html:90 +#: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" msgstr "元資料" -#: 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 "名稱:" -#: 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 "請用逗號(,)分隔多個值。" -#: bookwyrm/templates/author/edit_author.html:46 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "簡介:" -#: bookwyrm/templates/author/edit_author.html:51 +#: bookwyrm/templates/author/edit_author.html:57 msgid "Wikipedia link:" msgstr "維基百科連結:" -#: bookwyrm/templates/author/edit_author.html:57 +#: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" msgstr "出生日期:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" msgstr "死亡日期:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" msgstr "作者標識號:" -#: bookwyrm/templates/author/edit_author.html:74 +#: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" msgstr "Openlibrary key:" -#: 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 "Inventaire ID:" -#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "Librarything key:" -#: bookwyrm/templates/author/edit_author.html:89 +#: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" msgstr "Goodreads key:" -#: bookwyrm/templates/author/edit_author.html:98 -#: bookwyrm/templates/book/book.html:124 -#: bookwyrm/templates/book/edit_book.html:263 +#: bookwyrm/templates/author/edit_author.html:116 +#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/edit_book.html:321 +#: bookwyrm/templates/book/readthrough.html:77 #: bookwyrm/templates/lists/form.html:42 -#: bookwyrm/templates/preferences/edit_user.html:70 +#: bookwyrm/templates/preferences/edit_user.html:78 #: 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/snippets/readthrough.html:77 +#: bookwyrm/templates/settings/site.html:108 #: 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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "儲存" -#: bookwyrm/templates/author/edit_author.html:99 -#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 +#: bookwyrm/templates/author/edit_author.html:117 +#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:264 +#: bookwyrm/templates/book/edit_book.html:322 +#: bookwyrm/templates/book/readthrough.html:78 #: bookwyrm/templates/moderation/report_modal.html:34 #: 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 #: 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/start_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book/book.html:31 +#: bookwyrm/templates/book/book.html:48 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" msgstr "作者" -#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 +#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 msgid "Edit Book" msgstr "編輯書目" -#: bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:74 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "新增封面" -#: bookwyrm/templates/book/book.html:61 +#: bookwyrm/templates/book/book.html:78 msgid "Failed to load cover" msgstr "載入封面失敗" -#: bookwyrm/templates/book/book.html:101 +#: bookwyrm/templates/book/book.html:118 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 則書評)" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:130 msgid "Add Description" msgstr "新增描述" -#: bookwyrm/templates/book/book.html:120 -#: bookwyrm/templates/book/edit_book.html:108 +#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:134 +#: bookwyrm/templates/book/book.html:151 #, python-format msgid "%(count)s editions" msgstr "%(count)s 個版本" -#: bookwyrm/templates/book/book.html:142 +#: bookwyrm/templates/book/book.html:159 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "此版本在你的 %(shelf_name)s 書架上。" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:165 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "本書的 另一個版本 在你的 %(shelf_name)s 書架上。" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:176 msgid "Your reading activity" msgstr "你的閱讀活動" -#: bookwyrm/templates/book/book.html:162 +#: bookwyrm/templates/book/book.html:179 msgid "Add read dates" msgstr "新增閱讀日期" -#: bookwyrm/templates/book/book.html:171 +#: bookwyrm/templates/book/book.html:188 msgid "Create" msgstr "建立" -#: bookwyrm/templates/book/book.html:181 +#: bookwyrm/templates/book/book.html:198 msgid "You don't have any reading activity for this book." msgstr "你還未閱讀這本書。" -#: bookwyrm/templates/book/book.html:200 +#: bookwyrm/templates/book/book.html:217 msgid "Reviews" msgstr "書評" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:222 msgid "Your reviews" msgstr "你的書評" -#: bookwyrm/templates/book/book.html:211 +#: bookwyrm/templates/book/book.html:228 msgid "Your comments" msgstr "你的評論" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:234 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:253 +#: bookwyrm/templates/book/book.html:270 msgid "Subjects" msgstr "主題" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:282 msgid "Places" msgstr "地點" -#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 #: 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:68 +#: bookwyrm/templates/user/layout.html:75 msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:304 msgid "Add to list" msgstr "新增到列表" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:314 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -393,22 +425,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 "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 "上載封面:" #: 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 "從網址載入封面:" @@ -423,127 +455,134 @@ msgstr "編輯 \"%(book_title)s\"" msgid "Add Book" msgstr "新增書目" -#: bookwyrm/templates/book/edit_book.html:40 +#: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" msgstr "確認書目資料" -#: bookwyrm/templates/book/edit_book.html:47 +#: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" msgstr "\"%(name)s\" 是已存在的作者嗎？" -#: bookwyrm/templates/book/edit_book.html:52 +#: bookwyrm/templates/book/edit_book.html:71 #, python-format msgid "Author of %(book_title)s" msgstr "%(book_title)s 的作者" -#: bookwyrm/templates/book/edit_book.html:55 +#: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" msgstr "這是一位新的作者" -#: bookwyrm/templates/book/edit_book.html:61 +#: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" msgstr "正在建立新的作者: %(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 "這是已存在的作品的另一個版本嗎？" -#: bookwyrm/templates/book/edit_book.html:71 +#: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" msgstr "這是一個新的作品。" -#: bookwyrm/templates/book/edit_book.html:77 +#: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" msgstr "確認" -#: bookwyrm/templates/book/edit_book.html:79 +#: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" msgstr "返回" -#: bookwyrm/templates/book/edit_book.html:93 +#: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" msgstr "標題:" -#: bookwyrm/templates/book/edit_book.html:101 +#: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" msgstr "副標題:" -#: bookwyrm/templates/book/edit_book.html:114 +#: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" msgstr "系列:" -#: bookwyrm/templates/book/edit_book.html:122 +#: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" msgstr "系列編號:" -#: bookwyrm/templates/book/edit_book.html:130 +#: bookwyrm/templates/book/edit_book.html:160 msgid "Languages:" msgstr "語言:" -#: bookwyrm/templates/book/edit_book.html:139 +#: bookwyrm/templates/book/edit_book.html:169 msgid "Publisher:" msgstr "出版社:" -#: bookwyrm/templates/book/edit_book.html:148 +#: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" msgstr "初版時間:" -#: bookwyrm/templates/book/edit_book.html:156 +#: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" msgstr "出版時間:" -#: bookwyrm/templates/book/edit_book.html:165 +#: bookwyrm/templates/book/edit_book.html:195 msgid "Authors" msgstr "作者" -#: bookwyrm/templates/book/edit_book.html:171 -#, python-format -msgid "Remove %(name)s" -msgstr "移除 %(name)s" +#: bookwyrm/templates/book/edit_book.html:202 +#, fuzzy, python-format +#| msgid "Remove from %(name)s" +msgid "Remove %(name)s" +msgstr "從 %(name)s 移除" -#: bookwyrm/templates/book/edit_book.html:176 +#: bookwyrm/templates/book/edit_book.html:205 +#, fuzzy, python-format +#| msgid "Remove from %(name)s" +msgid "Author page for %(name)s" +msgstr "從 %(name)s 移除" + +#: bookwyrm/templates/book/edit_book.html:212 msgid "Add Authors:" msgstr "新增作者:" -#: bookwyrm/templates/book/edit_book.html:177 +#: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" msgstr "John Doe, Jane Smith" -#: bookwyrm/templates/book/edit_book.html:183 +#: bookwyrm/templates/book/edit_book.html:220 #: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" msgstr "封面" -#: bookwyrm/templates/book/edit_book.html:211 +#: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" msgstr "實體性質" -#: bookwyrm/templates/book/edit_book.html:212 +#: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit_book.html:220 +#: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" msgstr "頁數:" -#: bookwyrm/templates/book/edit_book.html:227 +#: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" msgstr "書目標識號" -#: 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 "Openlibrary ID:" @@ -605,11 +644,40 @@ msgstr "由 %(publisher)s 出版。" msgid "rated it" msgstr "評價了" +#: bookwyrm/templates/book/readthrough.html:8 +msgid "Progress Updates:" +msgstr "進度更新:" + +#: bookwyrm/templates/book/readthrough.html:14 +msgid "finished" +msgstr "已完成" + +#: bookwyrm/templates/book/readthrough.html:25 +msgid "Show all updates" +msgstr "顯示所有更新" + +#: bookwyrm/templates/book/readthrough.html:41 +msgid "Delete this progress update" +msgstr "刪除此進度更新" + +#: bookwyrm/templates/book/readthrough.html:52 +msgid "started" +msgstr "已開始" + +#: bookwyrm/templates/book/readthrough.html:59 +#: bookwyrm/templates/book/readthrough.html:73 +msgid "Edit read dates" +msgstr "編輯閱讀日期" + +#: bookwyrm/templates/book/readthrough.html:63 +msgid "Delete these read dates" +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/feed/layout.html:71 +#: bookwyrm/templates/get_started/layout.html:20 +#: bookwyrm/templates/get_started/layout.html:53 #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" @@ -619,6 +687,60 @@ msgstr "關閉" msgid "Compose status" msgstr "撰寫狀態" +#: bookwyrm/templates/confirm_email/confirm_email.html:4 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm email" +msgstr "確認" + +#: bookwyrm/templates/confirm_email/confirm_email.html:7 +#, fuzzy +#| msgid "Email address:" +msgid "Confirm your email address" +msgstr "郵箱地址:" + +#: bookwyrm/templates/confirm_email/confirm_email.html:13 +msgid "A confirmation code has been sent to the email address you used to register your account." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:15 +msgid "Sorry! We couldn't find that code." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:19 +#, fuzzy +#| msgid "Confirm password:" +msgid "Confirmation code:" +msgstr "確認密碼:" + +#: bookwyrm/templates/confirm_email/confirm_email.html:25 +#: bookwyrm/templates/discover/landing_layout.html:70 +#: bookwyrm/templates/moderation/report_modal.html:33 +msgid "Submit" +msgstr "提交" + +#: bookwyrm/templates/confirm_email/confirm_email.html:32 +msgid "Can't find your code?" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:4 +msgid "Resend confirmation link" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_form.html:11 +#: 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/confirm_email/resend_form.html:17 +#, fuzzy +#| msgid "Re-send invite" +msgid "Resend link" +msgstr "重新發送請求" + #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" msgstr "社群" @@ -633,7 +755,7 @@ msgstr "跨站社群" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/layout.html:71 msgid "Directory" msgstr "目錄" @@ -664,21 +786,30 @@ msgstr "受推薦" msgid "Recently active" msgstr "最近活躍" -#: bookwyrm/templates/directory/user_card.html:33 +#: bookwyrm/templates/directory/user_card.html:17 +#: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/user/user_preview.html:16 +#: bookwyrm/templates/user/user_preview.html:17 +#, fuzzy +#| msgid "Your Account" +msgid "Locked account" +msgstr "你的帳號" + +#: bookwyrm/templates/directory/user_card.html:40 msgid "follower you follow" msgid_plural "followers you follow" msgstr[0] "你關注的關注者" -#: bookwyrm/templates/directory/user_card.html:40 +#: bookwyrm/templates/directory/user_card.html:47 msgid "book on your shelves" msgid_plural "books on your shelves" msgstr[0] "你書架上的書" -#: bookwyrm/templates/directory/user_card.html:48 +#: bookwyrm/templates/directory/user_card.html:55 msgid "posts" msgstr "發文" -#: bookwyrm/templates/directory/user_card.html:54 +#: bookwyrm/templates/directory/user_card.html:61 msgid "last active" msgstr "最後活躍" @@ -714,7 +845,7 @@ msgid "Recent Books" msgstr "最近書目" #: bookwyrm/templates/discover/landing_layout.html:5 -#: bookwyrm/templates/get_started/layout.html:4 +#: bookwyrm/templates/get_started/layout.html:5 msgid "Welcome" msgstr "歡迎" @@ -736,7 +867,7 @@ msgid "Join %(name)s" msgstr "加入 %(name)s" #: bookwyrm/templates/discover/landing_layout.html:51 -#: bookwyrm/templates/login.html:51 +#: bookwyrm/templates/login.html:56 msgid "This instance is closed" msgstr "本實例不開放。" @@ -748,22 +879,26 @@ msgstr "謝謝你！我們已經受到了你的請求。" 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:33 -msgid "Submit" -msgstr "提交" - #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" msgstr "你的帳號" +#: bookwyrm/templates/email/confirm/html_content.html:6 +#: bookwyrm/templates/email/confirm/text_content.html:4 +#, python-format +msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:11 +#, fuzzy +#| msgid "Confirm" +msgid "Confirm Email" +msgstr "確認" + +#: bookwyrm/templates/email/confirm/subject.html:2 +msgid "Please confirm your email" +msgstr "" + #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," @@ -832,7 +967,7 @@ msgid "Direct Messages with %(username)s" msgstr "與 %(username)s 私信" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:99 msgid "Direct Messages" msgstr "私信" @@ -844,91 +979,55 @@ msgstr "所有訊息" msgid "You have no messages right now." msgstr "你現在沒有訊息。" -#: bookwyrm/templates/feed/feed.html:8 -msgid "Home Timeline" -msgstr "主頁時間線" - -#: bookwyrm/templates/feed/feed.html:10 -msgid "Local Timeline" -msgstr "本地時間線" - -#: bookwyrm/templates/feed/feed.html:12 -msgid "Federated Timeline" -msgstr "跨站時間線" - -#: bookwyrm/templates/feed/feed.html:18 -msgid "Home" -msgstr "主頁" - -#: bookwyrm/templates/feed/feed.html:21 -msgid "Local" -msgstr "本站" - -#: bookwyrm/templates/feed/feed.html:24 -#: bookwyrm/templates/settings/edit_server.html:40 -msgid "Federated" -msgstr "跨站" - -#: bookwyrm/templates/feed/feed.html:32 -#, python-format -msgid "load 0 unread status(es)" +#: bookwyrm/templates/feed/feed.html:22 +#, fuzzy, python-format +#| msgid "load 0 unread status(es)" +msgid "load 0 unread status(es)" msgstr "載入 0 條未讀狀態" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:38 msgid "There aren't any activities right now! Try following a user to get started" msgstr "現在還沒有任何活動！嘗試著從關注一個使用者開始吧" -#: bookwyrm/templates/feed/feed.html:55 -#: bookwyrm/templates/get_started/users.html:6 -msgid "Who to follow" -msgstr "可以關注的人" - -#: bookwyrm/templates/feed/feed_layout.html:4 +#: bookwyrm/templates/feed/layout.html:5 msgid "Updates" msgstr "更新" -#: bookwyrm/templates/feed/feed_layout.html:10 +#: bookwyrm/templates/feed/layout.html:12 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "你的書目" -#: bookwyrm/templates/feed/feed_layout.html:12 +#: bookwyrm/templates/feed/layout.html:14 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/layout.html:25 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "To Read" msgstr "想讀" -#: bookwyrm/templates/feed/feed_layout.html:24 +#: bookwyrm/templates/feed/layout.html:26 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Currently Reading" msgstr "在讀" -#: bookwyrm/templates/feed/feed_layout.html:25 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 +#: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" msgstr "讀過" -#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 +#: bookwyrm/templates/feed/layout.html:90 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/suggested_users.html:16 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -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] "%(shared_books)s 本在你書架上也有的書" +#: bookwyrm/templates/feed/suggested_users.html:3 +#: bookwyrm/templates/get_started/users.html:6 +msgid "Who to follow" +msgstr "可以關注的人" #: bookwyrm/templates/get_started/book_preview.html:6 #, python-format @@ -959,7 +1058,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:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45 #: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 @@ -985,33 +1084,33 @@ msgstr "沒有找到書目" msgid "Save & continue" msgstr "儲存 & 繼續" -#: bookwyrm/templates/get_started/layout.html:14 +#: bookwyrm/templates/get_started/layout.html:15 #, python-format msgid "Welcome to %(site_name)s!" msgstr "歡迎來到 %(site_name)s！" -#: bookwyrm/templates/get_started/layout.html:16 +#: bookwyrm/templates/get_started/layout.html:17 msgid "These are some first steps to get you started." msgstr "這些最初的步驟可以幫助你入門。" -#: bookwyrm/templates/get_started/layout.html:30 +#: bookwyrm/templates/get_started/layout.html:31 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" msgstr "建立你的使用者資料" -#: bookwyrm/templates/get_started/layout.html:34 +#: bookwyrm/templates/get_started/layout.html:35 msgid "Add books" msgstr "新增書目" -#: bookwyrm/templates/get_started/layout.html:38 +#: bookwyrm/templates/get_started/layout.html:39 msgid "Find friends" msgstr "尋找同好" -#: bookwyrm/templates/get_started/layout.html:44 +#: bookwyrm/templates/get_started/layout.html:45 msgid "Skip this step" msgstr "跳過此步驟" -#: bookwyrm/templates/get_started/layout.html:48 +#: bookwyrm/templates/get_started/layout.html:49 msgid "Finish" msgstr "完成" @@ -1040,7 +1139,7 @@ msgid "Manually approve followers:" msgstr "手動批准關注者:" #: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:58 +#: bookwyrm/templates/preferences/edit_user.html:66 msgid "Show this account in suggested users:" msgstr "在推薦的使用者中顯示此帳號:" @@ -1121,75 +1220,92 @@ msgstr "最近的匯入" msgid "No recent imports" msgstr "無最近的匯入" -#: bookwyrm/templates/import_status.html:5 -#: bookwyrm/templates/import_status.html:9 +#: bookwyrm/templates/import_status.html:6 +#: bookwyrm/templates/import_status.html:10 msgid "Import Status" msgstr "匯入狀態" -#: bookwyrm/templates/import_status.html:12 +#: bookwyrm/templates/import_status.html:11 +#, fuzzy +#| msgid "Back to reports" +msgid "Back to imports" +msgstr "回到舉報" + +#: bookwyrm/templates/import_status.html:15 msgid "Import started:" msgstr "匯入開始:" -#: bookwyrm/templates/import_status.html:16 +#: bookwyrm/templates/import_status.html:20 msgid "Import completed:" msgstr "匯入完成:" -#: bookwyrm/templates/import_status.html:19 +#: bookwyrm/templates/import_status.html:25 msgid "TASK FAILED" msgstr "任務失敗" -#: bookwyrm/templates/import_status.html:25 +#: bookwyrm/templates/import_status.html:32 msgid "Import still in progress." msgstr "還在匯入中。" -#: bookwyrm/templates/import_status.html:27 +#: bookwyrm/templates/import_status.html:34 msgid "(Hit reload to update!)" msgstr "（按下重新載入來更新！）" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import_status.html:41 msgid "Failed to load" msgstr "載入失敗" -#: bookwyrm/templates/import_status.html:43 +#: bookwyrm/templates/import_status.html:50 #, 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:78 +#: bookwyrm/templates/import_status.html:62 +#, python-format +msgid "Line %(index)s: %(title)s by %(author)s" +msgstr "" + +#: bookwyrm/templates/import_status.html:82 msgid "Select all" msgstr "全選" -#: bookwyrm/templates/import_status.html:81 +#: bookwyrm/templates/import_status.html:85 msgid "Retry items" msgstr "重試項目" -#: bookwyrm/templates/import_status.html:107 +#: bookwyrm/templates/import_status.html:112 msgid "Successfully imported" msgstr "成功匯入了" -#: bookwyrm/templates/import_status.html:111 +#: bookwyrm/templates/import_status.html:114 +#, fuzzy +#| msgid "Import still in progress." +msgid "Import Progress" +msgstr "還在匯入中。" + +#: bookwyrm/templates/import_status.html:119 msgid "Book" msgstr "書目" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import_status.html:122 #: 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 "標題" -#: bookwyrm/templates/import_status.html:117 +#: bookwyrm/templates/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" msgstr "作者" -#: bookwyrm/templates/import_status.html:140 +#: bookwyrm/templates/import_status.html:148 msgid "Imported" msgstr "已匯入" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 -#: bookwyrm/templates/login.html:46 +#: bookwyrm/templates/login.html:51 msgid "Create an Account" msgstr "建立帳號" @@ -1214,27 +1330,27 @@ msgstr "\"%(query)s\" 的搜尋結果" msgid "Matching Books" msgstr "匹配的書目" -#: bookwyrm/templates/layout.html:33 +#: bookwyrm/templates/layout.html:40 msgid "Search for a book or user" msgstr "搜尋書目或使用者" -#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 +#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 msgid "Main navigation menu" msgstr "主導航選單" -#: bookwyrm/templates/layout.html:58 +#: bookwyrm/templates/layout.html:65 msgid "Feed" msgstr "動態" -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:94 msgid "Your Books" msgstr "你的書目" -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/layout.html:104 msgid "Settings" msgstr "設定" -#: bookwyrm/templates/layout.html:106 +#: bookwyrm/templates/layout.html:113 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1242,61 +1358,61 @@ msgstr "設定" msgid "Invites" msgstr "邀請" -#: bookwyrm/templates/layout.html:113 +#: bookwyrm/templates/layout.html:120 msgid "Admin" msgstr "管理員" -#: bookwyrm/templates/layout.html:120 +#: bookwyrm/templates/layout.html:127 msgid "Log out" msgstr "登出" -#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 +#: bookwyrm/templates/layout.html:135 bookwyrm/templates/layout.html:136 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "通知" -#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 -#: bookwyrm/templates/login.html:17 +#: bookwyrm/templates/layout.html:158 bookwyrm/templates/layout.html:162 +#: bookwyrm/templates/login.html:22 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "使用者名稱:" -#: bookwyrm/templates/layout.html:156 +#: bookwyrm/templates/layout.html:163 msgid "password" msgstr "密碼" -#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:41 msgid "Forgot your password?" msgstr "忘記了密碼？" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 -#: bookwyrm/templates/login.html:33 +#: bookwyrm/templates/layout.html:167 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/login.html:38 msgid "Log in" msgstr "登入" -#: bookwyrm/templates/layout.html:168 +#: bookwyrm/templates/layout.html:175 msgid "Join" msgstr "加入" -#: bookwyrm/templates/layout.html:206 +#: bookwyrm/templates/layout.html:213 msgid "About this instance" msgstr "關於本實例" -#: bookwyrm/templates/layout.html:210 +#: bookwyrm/templates/layout.html:217 msgid "Contact site admin" msgstr "聯絡網站管理員" -#: bookwyrm/templates/layout.html:214 +#: bookwyrm/templates/layout.html:221 msgid "Documentation" msgstr "文件:" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:228 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "在 %(support_title)s 上支援 %(site_name)s" -#: bookwyrm/templates/layout.html:225 +#: bookwyrm/templates/layout.html:232 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "BookWyrm 是開源軟體。你可以在 GitHub 貢獻或報告問題。" @@ -1447,16 +1563,20 @@ msgstr "你的列表" msgid "Login" msgstr "登入" -#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 +#: bookwyrm/templates/login.html:16 +msgid "Success! Email address confirmed." +msgstr "" + +#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" msgstr "密碼:" -#: bookwyrm/templates/login.html:52 +#: bookwyrm/templates/login.html:57 msgid "Contact an administrator to get an invite" msgstr "聯絡管理員以取得邀請" -#: bookwyrm/templates/login.html:63 +#: bookwyrm/templates/login.html:68 msgid "More about this site" msgstr "關於本網站的更多" @@ -1674,6 +1794,7 @@ msgstr "你什麼也沒錯過！" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "確認密碼:" @@ -1687,7 +1808,7 @@ msgstr "重設密碼" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/preferences_layout.html:26 +#: bookwyrm/templates/preferences/layout.html:30 msgid "Blocked Users" msgstr "封鎖的使用者" @@ -1698,7 +1819,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:19 +#: bookwyrm/templates/preferences/layout.html:19 msgid "Change Password" msgstr "更改密碼" @@ -1706,6 +1827,23 @@ msgstr "更改密碼" msgid "New password:" msgstr "新密碼:" +#: bookwyrm/templates/preferences/delete_user.html:4 +#: bookwyrm/templates/preferences/delete_user.html:7 +#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/layout.html:23 +#, fuzzy +#| msgid "Create an Account" +msgid "Delete Account" +msgstr "建立帳號" + +#: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Permanently delete account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:14 +msgid "Deleting your account cannot be undone. The username will not be available to register in the future." +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" @@ -1715,44 +1853,68 @@ msgstr "編輯使用者資料" msgid "Show set reading goal prompt in feed:" msgstr "在即時動態中顯示設定的閱讀目標提示:" -#: bookwyrm/templates/preferences/edit_user.html:62 +#: bookwyrm/templates/preferences/edit_user.html:58 +#, fuzzy +#| msgid "Post privacy" +msgid "Default post privacy:" +msgstr "發文隱私" + +#: bookwyrm/templates/preferences/edit_user.html:70 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "你的帳號會顯示在 目錄 中，並可能受其它 BookWyrm 使用者推薦。" -#: bookwyrm/templates/preferences/edit_user.html:65 +#: bookwyrm/templates/preferences/edit_user.html:73 msgid "Preferred Timezone: " msgstr "偏好時區:" -#: bookwyrm/templates/preferences/preferences_layout.html:11 +#: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "帳號" -#: bookwyrm/templates/preferences/preferences_layout.html:15 +#: bookwyrm/templates/preferences/layout.html:15 msgid "Profile" msgstr "使用者資料" -#: bookwyrm/templates/preferences/preferences_layout.html:22 +#: bookwyrm/templates/preferences/layout.html:26 msgid "Relationships" msgstr "關係" +#: bookwyrm/templates/reading_progress/finish.html:5 +#, fuzzy, python-format +#| msgid "Finish \"%(book_title)s\"" +msgid "Finish \"%(book_title)s\"" +msgstr "完成 \"%(book_title)s\"" + +#: bookwyrm/templates/reading_progress/start.html:5 +#, fuzzy, python-format +#| msgid "Edit \"%(book_title)s\"" +msgid "Start \"%(book_title)s\"" +msgstr "編輯 \"%(book_title)s\"" + +#: bookwyrm/templates/reading_progress/want.html:5 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Want to Read \"%(book_title)s\"" +msgstr "想要閱讀 \"%(book_title)s\"" + #: bookwyrm/templates/rss/title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 +#: bookwyrm/templates/snippets/status/status_header.html:36 msgid "rated" msgstr "評價了" #: bookwyrm/templates/rss/title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 +#: bookwyrm/templates/snippets/status/status_header.html:38 msgid "reviewed" msgstr "寫了書評給" #: bookwyrm/templates/rss/title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 +#: bookwyrm/templates/snippets/status/status_header.html:40 msgid "commented on" msgstr "評論了" #: bookwyrm/templates/rss/title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 +#: bookwyrm/templates/snippets/status/status_header.html:42 msgid "quoted" msgstr "引用了" @@ -1776,12 +1938,6 @@ msgstr "搜尋請求" msgid "Search type" msgstr "搜尋類別" -#: bookwyrm/templates/search/layout.html:21 -#: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:74 -msgid "Books" -msgstr "書目" - #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 #: bookwyrm/templates/settings/admin_layout.html:26 @@ -1957,6 +2113,10 @@ msgstr "實例:" msgid "Status:" msgstr "狀態:" +#: bookwyrm/templates/settings/edit_server.html:40 +msgid "Federated" +msgstr "跨站" + #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 msgid "Blocked" @@ -1983,7 +2143,7 @@ msgid "Details" msgstr "詳細" #: bookwyrm/templates/settings/federated_server.html:39 -#: bookwyrm/templates/user/layout.html:56 +#: bookwyrm/templates/user/layout.html:63 msgid "Activity" msgstr "活動" @@ -2022,7 +2182,7 @@ msgid "Edit" msgstr "編輯" #: bookwyrm/templates/settings/federated_server.html:105 -#: bookwyrm/templates/user_admin/user_moderation_actions.html:3 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:8 msgid "Actions" msgstr "動作" @@ -2228,15 +2388,27 @@ msgstr "管理員郵件:" msgid "Additional info:" msgstr "附加資訊:" -#: bookwyrm/templates/settings/site.html:83 -msgid "Allow registration:" +#: bookwyrm/templates/settings/site.html:85 +#, fuzzy +#| msgid "Allow registration:" +msgid "Allow registration" msgstr "允許註冊:" -#: bookwyrm/templates/settings/site.html:87 -msgid "Allow invite requests:" +#: bookwyrm/templates/settings/site.html:91 +#, fuzzy +#| msgid "Allow invite requests:" +msgid "Allow invite requests" msgstr "允許請求邀請:" -#: bookwyrm/templates/settings/site.html:91 +#: bookwyrm/templates/settings/site.html:97 +msgid "Require users to confirm email address" +msgstr "" + +#: bookwyrm/templates/settings/site.html:99 +msgid "(Recommended if registration is open)" +msgstr "" + +#: bookwyrm/templates/settings/site.html:102 msgid "Registration closed text:" msgstr "註冊關閉文字:" @@ -2245,13 +2417,20 @@ msgstr "註冊關閉文字:" msgid "Posted by %(username)s" msgstr "由 %(username)s 釋出" -#: bookwyrm/templates/snippets/book_cover.html:31 +#: bookwyrm/templates/snippets/authors.html:22 +#, python-format +msgid "and %(remainder_count_display)s other" +msgid_plural "and %(remainder_count_display)s others" +msgstr[0] "" + +#: bookwyrm/templates/snippets/book_cover.html:32 msgid "No cover" msgstr "沒有封面" -#: bookwyrm/templates/snippets/book_titleby.html:4 -#, python-format -msgid "%(title)s by " +#: bookwyrm/templates/snippets/book_titleby.html:6 +#, fuzzy, python-format +#| msgid "%(title)s by " +msgid "%(title)s by" msgstr "%(title)s 來自" #: bookwyrm/templates/snippets/boost_button.html:20 @@ -2333,7 +2512,7 @@ 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 +#: bookwyrm/templates/snippets/privacy_select.html:20 msgid "Private" msgstr "私密" @@ -2446,7 +2625,7 @@ 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/start_reading_modal.html:31 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" msgstr "發佈到即時動態" @@ -2490,13 +2669,13 @@ msgstr "往後" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 -#: bookwyrm/templates/snippets/privacy_select.html:10 +#: bookwyrm/templates/snippets/privacy_select.html:11 msgid "Public" msgstr "公開" #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 -#: bookwyrm/templates/snippets/privacy_select.html:13 +#: bookwyrm/templates/snippets/privacy_select.html:14 msgid "Unlisted" msgstr "不公開" @@ -2508,7 +2687,7 @@ msgstr "僅關注者" msgid "Post privacy" msgstr "發文隱私" -#: bookwyrm/templates/snippets/privacy_select.html:16 +#: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" @@ -2522,38 +2701,9 @@ msgstr "留下評價" msgid "Rate" msgstr "評價" -#: bookwyrm/templates/snippets/readthrough.html:8 -msgid "Progress Updates:" -msgstr "進度更新:" - -#: bookwyrm/templates/snippets/readthrough.html:14 -msgid "finished" -msgstr "已完成" - -#: bookwyrm/templates/snippets/readthrough.html:25 -msgid "Show all updates" -msgstr "顯示所有更新" - -#: bookwyrm/templates/snippets/readthrough.html:41 -msgid "Delete this progress update" -msgstr "刪除此進度更新" - -#: bookwyrm/templates/snippets/readthrough.html:52 -msgid "started" -msgstr "已開始" - -#: bookwyrm/templates/snippets/readthrough.html:59 -#: bookwyrm/templates/snippets/readthrough.html:73 -msgid "Edit read dates" -msgstr "編輯閱讀日期" - -#: bookwyrm/templates/snippets/readthrough.html:63 -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 +#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "已開始閱讀" @@ -2588,7 +2738,7 @@ msgid "Finish \"%(book_title)s\"" msgstr "完成 \"%(book_title)s\"" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 msgid "Update progress" msgstr "更新進度" @@ -2596,20 +2746,20 @@ msgstr "更新進度" msgid "More shelves" msgstr "更多書架" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11 msgid "Start reading" msgstr "開始閱讀" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19 msgid "Finish reading" msgstr "完成閱讀" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 #: 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:47 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57 #, python-format msgid "Remove from %(name)s" msgstr "從 %(name)s 移除" @@ -2624,17 +2774,17 @@ msgstr "開始 \"%(book_title)s\"" msgid "Want to Read \"%(book_title)s\"" msgstr "想要閱讀 \"%(book_title)s\"" -#: bookwyrm/templates/snippets/status/content_status.html:71 +#: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" msgstr "顯示更多" -#: bookwyrm/templates/snippets/status/content_status.html:86 +#: bookwyrm/templates/snippets/status/content_status.html:87 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" msgstr "顯示更少" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:117 msgid "Open image in new window" msgstr "在新視窗中開啟圖片" @@ -2657,7 +2807,7 @@ msgstr "喜歡狀態" msgid "boosted" msgstr "轉發了" -#: bookwyrm/templates/snippets/status/status_header.html:45 +#: bookwyrm/templates/snippets/status/status_header.html:46 #, python-format msgid "replied to %(username)s's status" msgstr "回覆了 %(username)s 的 狀態" @@ -2673,10 +2823,29 @@ 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 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:12 msgid "Send direct message" msgstr "發送私信" +#: bookwyrm/templates/snippets/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "%(mutuals)s 個你也關注的關注者" + +#: bookwyrm/templates/snippets/suggested_users.html:23 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "%(shared_books)s 本在你書架上也有的書" + +#: bookwyrm/templates/snippets/suggested_users.html:31 +#: bookwyrm/templates/user/user_preview.html:36 +#, fuzzy +#| msgid "followed you" +msgid "Follows you" +msgstr "關注了你" + #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" msgstr "切換到此版本" @@ -2689,15 +2858,15 @@ msgstr "升序排序" msgid "Sorted descending" msgstr "降序排序" -#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 +#: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "使用者使用者資料" -#: bookwyrm/templates/user/layout.html:37 +#: bookwyrm/templates/user/layout.html:44 msgid "Follow Requests" msgstr "關注請求" -#: bookwyrm/templates/user/layout.html:62 +#: bookwyrm/templates/user/layout.html:69 msgid "Reading Goal" msgstr "閱讀目標" @@ -2803,28 +2972,35 @@ msgstr "RSS 訂閱" msgid "No activities yet!" msgstr "還沒有活動！" -#: bookwyrm/templates/user/user_preview.html:15 +#: bookwyrm/templates/user/user_preview.html:22 #, python-format msgid "Joined %(date)s" msgstr "在 %(date)s 加入" -#: bookwyrm/templates/user/user_preview.html:19 +#: bookwyrm/templates/user/user_preview.html:26 #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" msgstr[0] "%(counter)s 個關注者" -#: bookwyrm/templates/user/user_preview.html:20 +#: bookwyrm/templates/user/user_preview.html:27 #, python-format msgid "%(counter)s following" msgstr "關注著 %(counter)s 人" -#: bookwyrm/templates/user/user_preview.html:26 +#: bookwyrm/templates/user/user_preview.html:34 #, python-format msgid "%(mutuals_display)s follower you follow" msgid_plural "%(mutuals_display)s followers you follow" msgstr[0] "%(mutuals_display)s 個你也關注的關注者" +#: bookwyrm/templates/user/user_preview.html:38 +#, fuzzy +#| msgid "follower you follow" +#| msgid_plural "followers you follow" +msgid "No followers you follow" +msgstr "你關注的關注者" + #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" msgstr "回到使用者" @@ -2880,22 +3056,35 @@ msgstr "實例詳情" msgid "View instance" msgstr "檢視實例" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:11 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:5 +msgid "Permanently deleted" +msgstr "" + +#: bookwyrm/templates/user_admin/user_moderation_actions.html:17 msgid "Suspend user" msgstr "停用使用者" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:13 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:19 msgid "Un-suspend user" msgstr "取消停用使用者" -#: bookwyrm/templates/user_admin/user_moderation_actions.html:21 +#: bookwyrm/templates/user_admin/user_moderation_actions.html:28 msgid "Access level:" msgstr "訪問權限:" -#: 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 "檔案超過了最大大小: 10MB" +#: bookwyrm/templatetags/utilities.py:30 +#, python-format +msgid "%(title)s: %(subtitle)s" +msgstr "" + +#: bookwyrm/views/authentication.py:69 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "不是有效的 csv 檔案" @@ -2909,3 +3098,14 @@ msgstr "沒有找到使用該郵箱的使用者。" msgid "A password reset link sent to %s" msgstr "密碼重置連結已傳送給 %s" +#~ msgid "Local Timeline" +#~ msgstr "本地時間線" + +#~ msgid "Federated Timeline" +#~ msgstr "跨站時間線" + +#~ msgid "Local" +#~ msgstr "本站" + +#~ msgid "Remove %(name)s" +#~ msgstr "移除 %(name)s" diff --git a/postgres-docker/Dockerfile b/postgres-docker/Dockerfile index fd4ad409a..48d6c2a5e 100644 --- a/postgres-docker/Dockerfile +++ b/postgres-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:latest +FROM postgres:13.0 # crontab RUN mkdir /backups diff --git a/pyproject.toml b/pyproject.toml index 1840c416c..28852bcad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,6 +25,8 @@ responses = "0.10.14" django-rename-app = "0.1.2" pytz = "^2021.1" gunicorn = "20.0.4" +boto3 = "^1.17" +django-storages = "^1.11" [tool.poetry.dev-dependencies] black = { version = "^20.8b1", allow-prereleases = true} diff --git a/pytest.ini b/pytest.ini index fa9dbc59f..8539d1167 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,3 +4,19 @@ python_files = tests.py test_*.py *_tests.py addopts = --cov=bookwyrm --cov-config=.coveragerc markers = integration: marks tests as requiring external resources (deselect with '-m "not integration"') + +env = + DEBUG = false + DOMAIN = your.domain.here + BOOKWYRM_DATABASE_BACKEND = postgres + MEDIA_ROOT = images/ + CELERY_BROKER = "" + REDIS_BROKER_PORT = 6379 + FLOWER_PORT = 8888 + EMAIL_HOST = "smtp.mailgun.org" + EMAIL_PORT = 587 + EMAIL_HOST_USER = "" + EMAIL_HOST_PASSWORD = "" + EMAIL_USE_TLS = true + ENABLE_PREVIEW_IMAGES = false + USE_S3 = false