From 0bb4b0d71dfe14c60f9be38fe574b5f181a32995 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Nov 2023 15:24:47 -0800 Subject: [PATCH 001/200] Changes to how images are serialized I'm just going to see if any tests fail? --- bookwyrm/activitypub/person.py | 2 +- bookwyrm/models/fields.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py index 85cf44409..139d6061d 100644 --- a/bookwyrm/activitypub/person.py +++ b/bookwyrm/activitypub/person.py @@ -35,7 +35,7 @@ class Person(ActivityObject): endpoints: Dict = None name: str = None summary: str = None - icon: Image = field(default_factory=lambda: {}) + icon: Image = None bookwyrmUser: bool = False manuallyApprovesFollowers: str = False discoverable: str = False diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 1e458c815..6c8a130f8 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -477,7 +477,7 @@ class ImageField(ActivitypubFieldMixin, models.ImageField): if not url: return None - return activitypub.Document(url=url, name=alt) + return activitypub.Image(url=url, name=alt) def field_from_activity(self, value, allow_external_connections=True): image_slug = value From 44b14f4933e80222a1b75dcdaf8ad236810280f8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Nov 2023 16:00:10 -0800 Subject: [PATCH 002/200] Fixes workflow errors --- bookwyrm/activitypub/person.py | 2 +- bookwyrm/tests/models/test_fields.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py index 139d6061d..dfec92e4c 100644 --- a/bookwyrm/activitypub/person.py +++ b/bookwyrm/activitypub/person.py @@ -1,5 +1,5 @@ """ actor serializer """ -from dataclasses import dataclass, field +from dataclasses import dataclass from typing import Dict from .base_activity import ActivityObject diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index 553a533d5..c27d144d7 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -436,7 +436,7 @@ class ModelFields(TestCase): ) ) self.assertEqual(output.name, "") - self.assertEqual(output.type, "Document") + self.assertEqual(output.type, "Image") @responses.activate def test_image_field_from_activity(self, *_): From 7684101f1591292c15be7d80b87d51937e21ff43 Mon Sep 17 00:00:00 2001 From: Matt Lehrer Date: Thu, 16 Nov 2023 10:38:41 +0100 Subject: [PATCH 003/200] move ratings to new edition --- bookwyrm/tests/views/books/test_editions.py | 28 +++++++++++++++++++++ bookwyrm/views/books/editions.py | 7 ++++++ 2 files changed, 35 insertions(+) diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py index 70a95051a..a40d97b57 100644 --- a/bookwyrm/tests/views/books/test_editions.py +++ b/bookwyrm/tests/views/books/test_editions.py @@ -129,3 +129,31 @@ class BookViews(TestCase): self.assertEqual(models.ShelfBook.objects.get().book, edition2) self.assertEqual(models.ReadThrough.objects.get().book, edition2) + + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + @patch("bookwyrm.activitystreams.populate_stream_task.delay") + @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") + def test_move_ratings_on_switch_edition(self, *_): + """updates user's rating on a book to new edition""" + work = models.Work.objects.create(title="test work") + edition1 = models.Edition.objects.create(title="first ed", parent_work=work) + edition2 = models.Edition.objects.create(title="second ed", parent_work=work) + + models.ReviewRating.objects.create( + book=edition1, + user=self.local_user, + rating=3, + ) + + self.assertIsInstance(models.ReviewRating.objects.get(user=self.local_user, book=edition1), models.ReviewRating) + with self.assertRaises(models.ReviewRating.DoesNotExist): + models.ReviewRating.objects.get(user=self.local_user, book=edition2) + + request = self.factory.post("", {"edition": edition2.id}) + request.user = self.local_user + views.switch_edition(request) + + self.assertIsInstance(models.ReviewRating.objects.get(user=self.local_user, book=edition2), models.ReviewRating) + with self.assertRaises(models.ReviewRating.DoesNotExist): + models.ReviewRating.objects.get(user=self.local_user, book=edition1) diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index 54d1bd84c..e34b045bb 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -103,4 +103,11 @@ def switch_edition(request): readthrough.book = new_edition readthrough.save() + ratings = models.ReviewRating.objects.filter( + book__parent_work=new_edition.parent_work, user=request.user + ) + for rating in ratings.all(): + rating.book = new_edition + rating.save() + return redirect(f"/book/{new_edition.id}") From bd920a4630975f3e5adac6c078dc1a5eaf9a48f6 Mon Sep 17 00:00:00 2001 From: Matt Lehrer Date: Thu, 16 Nov 2023 10:38:45 +0100 Subject: [PATCH 004/200] move reviews to new edition --- bookwyrm/tests/views/books/test_editions.py | 30 +++++++++++++++++++++ bookwyrm/views/books/editions.py | 7 +++++ 2 files changed, 37 insertions(+) diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py index a40d97b57..bbae517ac 100644 --- a/bookwyrm/tests/views/books/test_editions.py +++ b/bookwyrm/tests/views/books/test_editions.py @@ -157,3 +157,33 @@ class BookViews(TestCase): self.assertIsInstance(models.ReviewRating.objects.get(user=self.local_user, book=edition2), models.ReviewRating) with self.assertRaises(models.ReviewRating.DoesNotExist): models.ReviewRating.objects.get(user=self.local_user, book=edition1) + + @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") + @patch("bookwyrm.activitystreams.populate_stream_task.delay") + @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") + def test_move_reviews_on_switch_edition(self, *_): + """updates user's review on a book to new edition""" + work = models.Work.objects.create(title="test work") + edition1 = models.Edition.objects.create(title="first ed", parent_work=work) + edition2 = models.Edition.objects.create(title="second ed", parent_work=work) + + models.Review.objects.create( + book=edition1, + user=self.local_user, + name="blah", + rating=3, + content="not bad" + ) + + self.assertIsInstance(models.Review.objects.get(user=self.local_user, book=edition1), models.Review) + with self.assertRaises(models.Review.DoesNotExist): + models.Review.objects.get(user=self.local_user, book=edition2) + + request = self.factory.post("", {"edition": edition2.id}) + request.user = self.local_user + views.switch_edition(request) + + self.assertIsInstance(models.Review.objects.get(user=self.local_user, book=edition2), models.Review) + with self.assertRaises(models.Review.DoesNotExist): + models.Review.objects.get(user=self.local_user, book=edition1) diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index e34b045bb..f061caab8 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -110,4 +110,11 @@ def switch_edition(request): rating.book = new_edition rating.save() + reviews = models.Review.objects.filter( + book__parent_work=new_edition.parent_work, user=request.user + ) + for review in reviews.all(): + review.book = new_edition + review.save() + return redirect(f"/book/{new_edition.id}") From f4da9fbf34fdf65d94315847022a00d08ef01a16 Mon Sep 17 00:00:00 2001 From: Matt Lehrer Date: Thu, 16 Nov 2023 20:37:46 +0100 Subject: [PATCH 005/200] remove unnecessary loop. ReviewRatings are a subclass and are included in the models.Review block --- bookwyrm/views/books/editions.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index f061caab8..2bbb1c579 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -103,17 +103,12 @@ def switch_edition(request): readthrough.book = new_edition readthrough.save() - ratings = models.ReviewRating.objects.filter( - book__parent_work=new_edition.parent_work, user=request.user - ) - for rating in ratings.all(): - rating.book = new_edition - rating.save() - reviews = models.Review.objects.filter( book__parent_work=new_edition.parent_work, user=request.user ) for review in reviews.all(): + # because ratings are a subclass of reviews, + # this will pick up both ratings and reviews review.book = new_edition review.save() From 0299f2e2352773c53155ae815cd0a525d6408fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Fri, 24 Nov 2023 21:18:43 -0300 Subject: [PATCH 006/200] Add functional tests for search_vector triggers As metadata changes, search continues to work. --- bookwyrm/tests/test_book_search.py | 83 ++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index db6ba8353..2baff9bf1 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -134,3 +134,86 @@ class BookSearch(TestCase): # there's really not much to test here, it's just a dataclass self.assertEqual(result.confidence, 1) self.assertEqual(result.title, "Title") + + +class SearchVectorTriggers(TestCase): + """look for books as they change""" + + def setUp(self): + """we need basic test data and mocks""" + self.work = models.Work.objects.create(title="This Work") + self.author = models.Author.objects.create(name="Name") + self.edition = models.Edition.objects.create( + title="First Edition of Work", + subtitle="Some Extra Words Are Good", + series="A Fabulous Sequence of Items", + parent_work=self.work, + isbn_10="0000000000", + ) + self.edition.authors.add(self.author) + self.edition.save(broadcast=False) + + def test_search_after_changed_metadata(self): + """book found after updating metadata""" + self.assertEqual(self.edition, self._search_first("First")) # title + self.assertEqual(self.edition, self._search_first("Good")) # subtitle + self.assertEqual(self.edition, self._search_first("Sequence")) # series + + self.edition.title = "Second Title of Work" + self.edition.subtitle = "Fewer Words Is Better" + self.edition.series = "A Wondrous Bunch" + self.edition.save(broadcast=False) + + self.assertEqual(self.edition, self._search_first("Second")) # title new + self.assertEqual(self.edition, self._search_first("Fewer")) # subtitle new + self.assertEqual(self.edition, self._search_first("Wondrous")) # series new + + self.assertFalse(self._search_first("First")) # title old + self.assertFalse(self._search_first("Good")) # subtitle old + self.assertFalse(self._search_first("Sequence")) # series old + + def test_search_after_author_remove(self): + """book not found via removed author""" + self.assertEqual(self.edition, self._search_first("Name")) + + self.edition.authors.set([]) + self.edition.save(broadcast=False) + + self.assertFalse(self._search("Name")) + self.assertEqual(self.edition, self._search_first("Edition")) + + def test_search_after_author_add(self): + """book found by newly-added author""" + new_author = models.Author.objects.create(name="Mozilla") + + self.assertFalse(self._search("Mozilla")) + + self.edition.authors.add(new_author) + self.edition.save(broadcast=False) + + self.assertEqual(self.edition, self._search_first("Mozilla")) + self.assertEqual(self.edition, self._search_first("Name")) + + def test_search_after_updated_author_name(self): + """book found under new author name""" + self.assertEqual(self.edition, self._search_first("Name")) + self.assertFalse(self._search("Identifier")) + + self.author.name = "Identifier" + self.author.save(broadcast=False) + self.edition.refresh_from_db() + + self.assertFalse(self._search("Name")) + self.assertEqual(self.edition, self._search_first("Identifier")) + self.assertEqual(self.edition, self._search_first("Work")) + + def _search_first(self, query): + """wrapper around search_title_author""" + return self._search(query, return_first=True) + + # pylint: disable-next=no-self-use + def _search(self, query, *, return_first=False): + """wrapper around search_title_author""" + return book_search.search_title_author( + query, min_confidence=0, return_first=return_first + ) From e4d688665c7d54912b73752a270c4d4ead2a63b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Fri, 24 Nov 2023 14:15:00 -0300 Subject: [PATCH 007/200] Remove index for `author.search_vector`, which is never used --- bookwyrm/migrations/0190_book_search_updates.py | 16 ++++++++++++++++ bookwyrm/models/author.py | 6 ------ 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 bookwyrm/migrations/0190_book_search_updates.py diff --git a/bookwyrm/migrations/0190_book_search_updates.py b/bookwyrm/migrations/0190_book_search_updates.py new file mode 100644 index 000000000..52d80fcb9 --- /dev/null +++ b/bookwyrm/migrations/0190_book_search_updates.py @@ -0,0 +1,16 @@ +# Generated by Django 3.2.20 on 2023-11-24 17:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("bookwyrm", "0188_theme_loads"), + ] + + operations = [ + migrations.RemoveIndex( + model_name="author", + name="bookwyrm_au_search__b050a8_gin", + ), + ] diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 981e3c0cc..b4488d46a 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -2,7 +2,6 @@ import re from typing import Tuple, Any -from django.contrib.postgres.indexes import GinIndex from django.db import models from bookwyrm import activitypub @@ -68,8 +67,3 @@ class Author(BookDataModel): return f"https://{DOMAIN}/author/{self.id}" activity_serializer = activitypub.Author - - class Meta: - """sets up postgres GIN index field""" - - indexes = (GinIndex(fields=["search_vector"]),) From 44ef928c3ceb8ce9b4426113551baa53563630f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sat, 25 Nov 2023 16:08:36 -0300 Subject: [PATCH 008/200] Alter object row IDs to force test failure in original code --- bookwyrm/tests/test_book_search.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index 2baff9bf1..e66ea97be 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -1,5 +1,7 @@ """ test searching for books """ import datetime +from unittest import expectedFailure +from django.db import connection from django.test import TestCase from django.utils import timezone @@ -153,6 +155,17 @@ class SearchVectorTriggers(TestCase): self.edition.authors.add(self.author) self.edition.save(broadcast=False) + @classmethod + def setUpTestData(cls): + """create conditions that trigger known old bugs""" + with connection.cursor() as cursor: + cursor.execute( + """ + ALTER SEQUENCE bookwyrm_author_id_seq RESTART WITH 20; + ALTER SEQUENCE bookwyrm_book_authors_id_seq RESTART WITH 300; + """ + ) + def test_search_after_changed_metadata(self): """book found after updating metadata""" self.assertEqual(self.edition, self._search_first("First")) # title @@ -194,6 +207,7 @@ class SearchVectorTriggers(TestCase): self.assertEqual(self.edition, self._search_first("Mozilla")) self.assertEqual(self.edition, self._search_first("Name")) + @expectedFailure def test_search_after_updated_author_name(self): """book found under new author name""" self.assertEqual(self.edition, self._search_first("Name")) From 416a6caf2d4124b884fd1a04841908e572d92c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Fri, 24 Nov 2023 22:26:13 -0300 Subject: [PATCH 009/200] Define `author_search_vector_trigger` via Author.Meta.triggers Previously, triggers lived only in a particular migration file. With this change, code for the triggers resides in the model, and their lifecycle is managed through normal Django migrations. --- ...grate_search_vec_triggers_to_pgtriggers.py | 50 +++++++++++++++++++ bookwyrm/models/author.py | 29 +++++++++++ bookwyrm/settings.py | 1 + bookwyrm/utils/db.py | 22 ++++++++ requirements.txt | 1 + 5 files changed, 103 insertions(+) create mode 100644 bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py create mode 100644 bookwyrm/utils/db.py diff --git a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py new file mode 100644 index 000000000..10354fa67 --- /dev/null +++ b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py @@ -0,0 +1,50 @@ +# Generated by Django 3.2.20 on 2023-11-25 00:47 + +from importlib import import_module +import re + +from django.db import migrations +import pgtrigger.compiler +import pgtrigger.migrations + +trigger_migration = import_module("bookwyrm.migrations.0077_auto_20210623_2155") + +# it's _very_ convenient for development that this migration be reversible +search_vector_trigger = trigger_migration.Migration.operations[4] +author_search_vector_trigger = trigger_migration.Migration.operations[5] + + +assert re.search(r"\bCREATE TRIGGER search_vector_trigger\b", search_vector_trigger.sql) +assert re.search( + r"\bCREATE TRIGGER author_search_vector_trigger\b", + author_search_vector_trigger.sql, +) + + +class Migration(migrations.Migration): + dependencies = [ + ("bookwyrm", "0190_book_search_updates"), + ] + + operations = [ + pgtrigger.migrations.AddTrigger( + model_name="author", + trigger=pgtrigger.compiler.Trigger( + name="reset_search_vector_on_author_edit", + sql=pgtrigger.compiler.UpsertTriggerSql( + func="WITH book AS (SELECT bookwyrm_book.id AS row_id FROM bookwyrm_author LEFT OUTER JOIN bookwyrm_book_authors ON bookwyrm_book_authors.id = new.id LEFT OUTER JOIN bookwyrm_book ON bookwyrm_book.id = bookwyrm_book_authors.book_id) UPDATE bookwyrm_book SET search_vector = '' FROM book WHERE id = book.row_id;RETURN NEW;", + hash="9c0a472e2bf60e63d593cce49f47972c7b227a00", + operation='UPDATE OF "name"', + pgid="pgtrigger_reset_search_vector_on_author_edit_a447c", + table="bookwyrm_author", + when="AFTER", + ), + ), + ), + migrations.RunSQL( + sql="""DROP TRIGGER IF EXISTS author_search_vector_trigger ON bookwyrm_author; + DROP FUNCTION IF EXISTS author_trigger; + """, + reverse_sql=author_search_vector_trigger.sql, + ), + ] diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index b4488d46a..9b4f3c1bd 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -3,9 +3,11 @@ import re from typing import Tuple, Any from django.db import models +import pgtrigger from bookwyrm import activitypub from bookwyrm.settings import DOMAIN +from bookwyrm.utils.db import format_trigger from .book import BookDataModel from . import fields @@ -66,4 +68,31 @@ class Author(BookDataModel): """editions and works both use "book" instead of model_name""" return f"https://{DOMAIN}/author/{self.id}" + class Meta: + """sets up indexes and triggers""" + + triggers = [ + pgtrigger.Trigger( + name="reset_search_vector_on_author_edit", + when=pgtrigger.After, + operation=pgtrigger.UpdateOf("name"), + func=format_trigger( + """WITH book AS ( + SELECT bookwyrm_book.id AS row_id + FROM bookwyrm_author + LEFT OUTER JOIN bookwyrm_book_authors + ON bookwyrm_book_authors.id = new.id + LEFT OUTER JOIN bookwyrm_book + ON bookwyrm_book.id = bookwyrm_book_authors.book_id + ) + UPDATE bookwyrm_book + SET search_vector = '' + FROM book + WHERE id = book.row_id; + RETURN new; + """ + ), + ) + ] + activity_serializer = activitypub.Author diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 4cecc4df6..aaa50c56d 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -104,6 +104,7 @@ INSTALLED_APPS = [ "celery", "django_celery_beat", "imagekit", + "pgtrigger", "storages", ] diff --git a/bookwyrm/utils/db.py b/bookwyrm/utils/db.py new file mode 100644 index 000000000..8b74d9bf5 --- /dev/null +++ b/bookwyrm/utils/db.py @@ -0,0 +1,22 @@ +""" Database utilities """ + +from typing import cast +import sqlparse # type: ignore + + +def format_trigger(sql: str) -> str: + """format SQL trigger before storing + + we remove whitespace and use consistent casing so as to avoid migrations + due to formatting changes. + """ + return cast( + str, + sqlparse.format( + sql, + strip_comments=True, + strip_whitespace=True, + keyword_case="upper", + identifier_case="lower", + ), + ) diff --git a/requirements.txt b/requirements.txt index 36192f148..05fd9d2b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ django-celery-beat==2.4.0 django-compressor==4.3.1 django-imagekit==4.1.0 django-model-utils==4.3.1 +django-pgtrigger==4.10.0 django-sass-processor==1.2.2 django-csp==3.7 environs==9.5.0 From bcb3a343d4514fd9bc2674a918755aaa832c8886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sat, 25 Nov 2023 01:49:14 -0300 Subject: [PATCH 010/200] Fix JOIN in `author_search_vector_trigger`, add missing WHERE clause --- .../0191_migrate_search_vec_triggers_to_pgtriggers.py | 4 ++-- bookwyrm/models/author.py | 3 ++- bookwyrm/tests/test_book_search.py | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py index 10354fa67..1e51e529e 100644 --- a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py +++ b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py @@ -32,8 +32,8 @@ class Migration(migrations.Migration): trigger=pgtrigger.compiler.Trigger( name="reset_search_vector_on_author_edit", sql=pgtrigger.compiler.UpsertTriggerSql( - func="WITH book AS (SELECT bookwyrm_book.id AS row_id FROM bookwyrm_author LEFT OUTER JOIN bookwyrm_book_authors ON bookwyrm_book_authors.id = new.id LEFT OUTER JOIN bookwyrm_book ON bookwyrm_book.id = bookwyrm_book_authors.book_id) UPDATE bookwyrm_book SET search_vector = '' FROM book WHERE id = book.row_id;RETURN NEW;", - hash="9c0a472e2bf60e63d593cce49f47972c7b227a00", + func="WITH book AS (SELECT bookwyrm_book.id AS row_id FROM bookwyrm_author LEFT OUTER JOIN bookwyrm_book_authors ON bookwyrm_book_authors.author_id = bookwyrm_author.id LEFT OUTER JOIN bookwyrm_book ON bookwyrm_book.id = bookwyrm_book_authors.book_id WHERE bookwyrm_author.id = new.id ) UPDATE bookwyrm_book SET search_vector = '' FROM book WHERE id = book.row_id;RETURN NEW;", + hash="abc8ea76fa1bf02a0f56aaae390c1b970bef1278", operation='UPDATE OF "name"', pgid="pgtrigger_reset_search_vector_on_author_edit_a447c", table="bookwyrm_author", diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 9b4f3c1bd..6c5beba50 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -81,9 +81,10 @@ class Author(BookDataModel): SELECT bookwyrm_book.id AS row_id FROM bookwyrm_author LEFT OUTER JOIN bookwyrm_book_authors - ON bookwyrm_book_authors.id = new.id + ON bookwyrm_book_authors.author_id = bookwyrm_author.id LEFT OUTER JOIN bookwyrm_book ON bookwyrm_book.id = bookwyrm_book_authors.book_id + WHERE bookwyrm_author.id = new.id ) UPDATE bookwyrm_book SET search_vector = '' diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index e66ea97be..d2d5b692e 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -1,6 +1,5 @@ """ test searching for books """ import datetime -from unittest import expectedFailure from django.db import connection from django.test import TestCase from django.utils import timezone @@ -207,7 +206,6 @@ class SearchVectorTriggers(TestCase): self.assertEqual(self.edition, self._search_first("Mozilla")) self.assertEqual(self.edition, self._search_first("Name")) - @expectedFailure def test_search_after_updated_author_name(self): """book found under new author name""" self.assertEqual(self.edition, self._search_first("Name")) From 8df408e07eccefb934373f5c69b5068c1bee5046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sat, 25 Nov 2023 16:46:54 -0300 Subject: [PATCH 011/200] Define `search_vector_trigger` via Book.Meta.triggers --- ...grate_search_vec_triggers_to_pgtriggers.py | 20 +++++++++++ bookwyrm/models/book.py | 33 ++++++++++++++++++- bookwyrm/tests/test_book_search.py | 1 - bookwyrm/utils/db.py | 1 + 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py index 1e51e529e..929063781 100644 --- a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py +++ b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py @@ -27,6 +27,20 @@ class Migration(migrations.Migration): ] operations = [ + pgtrigger.migrations.AddTrigger( + model_name="book", + trigger=pgtrigger.compiler.Trigger( + name="update_search_vector_on_book_edit", + sql=pgtrigger.compiler.UpsertTriggerSql( + func="new.search_vector := coalesce(nullif(setweight(to_tsvector('english', coalesce(new.title, '')), 'A'), ''), setweight(to_tsvector('simple', coalesce(new.title, '')), 'A')) || setweight(to_tsvector('english', coalesce(new.subtitle, '')), 'B') || (SELECT setweight(to_tsvector('simple', coalesce(array_to_string(array_agg(bookwyrm_author.name), ' '), '')), 'C') FROM bookwyrm_book LEFT OUTER JOIN bookwyrm_book_authors ON bookwyrm_book.id = bookwyrm_book_authors.book_id LEFT OUTER JOIN bookwyrm_author ON bookwyrm_book_authors.author_id = bookwyrm_author.id WHERE bookwyrm_book.id = new.id ) || setweight(to_tsvector('english', coalesce(new.series, '')), 'D');RETURN NEW;", + hash="9c898d46dfb7492ecd18f6c692bbecfa548f0e85", + operation='INSERT OR UPDATE OF "title", "subtitle", "series", "search_vector"', + pgid="pgtrigger_update_search_vector_on_book_edit_bec58", + table="bookwyrm_book", + when="BEFORE", + ), + ), + ), pgtrigger.migrations.AddTrigger( model_name="author", trigger=pgtrigger.compiler.Trigger( @@ -41,6 +55,12 @@ class Migration(migrations.Migration): ), ), ), + migrations.RunSQL( + sql="""DROP TRIGGER IF EXISTS search_vector_trigger ON bookwyrm_book; + DROP FUNCTION IF EXISTS book_trigger; + """, + reverse_sql=search_vector_trigger.sql, + ), migrations.RunSQL( sql="""DROP TRIGGER IF EXISTS author_search_vector_trigger ON bookwyrm_author; DROP FUNCTION IF EXISTS author_trigger; diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 6893b9da1..ed26752e3 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -13,6 +13,7 @@ from django.utils.translation import gettext_lazy as _ from model_utils import FieldTracker from model_utils.managers import InheritanceManager from imagekit.models import ImageSpecField +import pgtrigger from bookwyrm import activitypub from bookwyrm.isbn.isbn import hyphenator_singleton as hyphenator @@ -24,6 +25,7 @@ from bookwyrm.settings import ( ENABLE_PREVIEW_IMAGES, ENABLE_THUMBNAIL_GENERATION, ) +from bookwyrm.utils.db import format_trigger from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin from .base_model import BookWyrmModel @@ -232,9 +234,38 @@ class Book(BookDataModel): ) class Meta: - """sets up postgres GIN index field""" + """set up indexes and triggers""" + + # pylint: disable=line-too-long indexes = (GinIndex(fields=["search_vector"]),) + triggers = [ + pgtrigger.Trigger( + name="update_search_vector_on_book_edit", + when=pgtrigger.Before, + operation=pgtrigger.Insert + | pgtrigger.UpdateOf("title", "subtitle", "series", "search_vector"), + func=format_trigger( + """new.search_vector := + COALESCE( + NULLIF(setweight(to_tsvector('english', COALESCE(new.title, '')), 'A'), ''), + setweight(to_tsvector('simple', COALESCE(new.title, '')), 'A') + ) || + setweight(to_tsvector('english', COALESCE(new.subtitle, '')), 'B') || + (SELECT setweight(to_tsvector('simple', COALESCE(array_to_string(ARRAY_AGG(bookwyrm_author.name), ' '), '')), 'C') + FROM bookwyrm_book + LEFT OUTER JOIN bookwyrm_book_authors + ON bookwyrm_book.id = bookwyrm_book_authors.book_id + LEFT OUTER JOIN bookwyrm_author + ON bookwyrm_book_authors.author_id = bookwyrm_author.id + WHERE bookwyrm_book.id = new.id + ) || + setweight(to_tsvector('english', COALESCE(new.series, '')), 'D'); + RETURN new; + """ + ), + ) + ] class Work(OrderedCollectionPageMixin, Book): diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index d2d5b692e..f9c75d279 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -213,7 +213,6 @@ class SearchVectorTriggers(TestCase): self.author.name = "Identifier" self.author.save(broadcast=False) - self.edition.refresh_from_db() self.assertFalse(self._search("Name")) self.assertEqual(self.edition, self._search_first("Identifier")) diff --git a/bookwyrm/utils/db.py b/bookwyrm/utils/db.py index 8b74d9bf5..2bb3b9ff6 100644 --- a/bookwyrm/utils/db.py +++ b/bookwyrm/utils/db.py @@ -16,6 +16,7 @@ def format_trigger(sql: str) -> str: sql, strip_comments=True, strip_whitespace=True, + use_space_around_operators=True, keyword_case="upper", identifier_case="lower", ), From 9bcb5b80ea9dd4f11cae26ad1fc752a7cb71dcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sat, 25 Nov 2023 18:13:05 -0300 Subject: [PATCH 012/200] Further simplify bookwyrm_author trigger --- ..._migrate_search_vec_triggers_to_pgtriggers.py | 4 ++-- bookwyrm/models/author.py | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py index 929063781..ddfe74a8b 100644 --- a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py +++ b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py @@ -46,8 +46,8 @@ class Migration(migrations.Migration): trigger=pgtrigger.compiler.Trigger( name="reset_search_vector_on_author_edit", sql=pgtrigger.compiler.UpsertTriggerSql( - func="WITH book AS (SELECT bookwyrm_book.id AS row_id FROM bookwyrm_author LEFT OUTER JOIN bookwyrm_book_authors ON bookwyrm_book_authors.author_id = bookwyrm_author.id LEFT OUTER JOIN bookwyrm_book ON bookwyrm_book.id = bookwyrm_book_authors.book_id WHERE bookwyrm_author.id = new.id ) UPDATE bookwyrm_book SET search_vector = '' FROM book WHERE id = book.row_id;RETURN NEW;", - hash="abc8ea76fa1bf02a0f56aaae390c1b970bef1278", + func="WITH updated_books AS (SELECT book_id FROM bookwyrm_book_authors WHERE author_id = new.id ) UPDATE bookwyrm_book SET search_vector = '' FROM updated_books WHERE id = updated_books.book_id;RETURN NEW;", + hash="e7bbf08711ff3724c58f4d92fb7a082ffb3d7826", operation='UPDATE OF "name"', pgid="pgtrigger_reset_search_vector_on_author_edit_a447c", table="bookwyrm_author", diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 6c5beba50..154b00ccb 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -77,19 +77,15 @@ class Author(BookDataModel): when=pgtrigger.After, operation=pgtrigger.UpdateOf("name"), func=format_trigger( - """WITH book AS ( - SELECT bookwyrm_book.id AS row_id - FROM bookwyrm_author - LEFT OUTER JOIN bookwyrm_book_authors - ON bookwyrm_book_authors.author_id = bookwyrm_author.id - LEFT OUTER JOIN bookwyrm_book - ON bookwyrm_book.id = bookwyrm_book_authors.book_id - WHERE bookwyrm_author.id = new.id + """WITH updated_books AS ( + SELECT book_id + FROM bookwyrm_book_authors + WHERE author_id = new.id ) UPDATE bookwyrm_book SET search_vector = '' - FROM book - WHERE id = book.row_id; + FROM updated_books + WHERE id = updated_books.book_id; RETURN new; """ ), From bbfbd1e97ab201cd87c6414127c603f615923ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sat, 25 Nov 2023 20:54:09 -0300 Subject: [PATCH 013/200] Add tests for trigger code (i.e. how search_vector is computed) --- bookwyrm/tests/test_book_search.py | 67 +++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index f9c75d279..99b62f0a0 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -137,6 +137,69 @@ class BookSearch(TestCase): self.assertEqual(result.title, "Title") +class SearchVectorTest(TestCase): + """check search_vector is computed correctly""" + + def test_search_vector_simple(self): + """simplest search vector""" + book = self._create_book("Book", "Mary") + self.assertEqual(book.search_vector, "'book':1A 'mary':2C") # A > C (priority) + + def test_search_vector_all_parts(self): + """search vector with subtitle and series""" + # for a book like this we call `to_tsvector("Book Long Mary Bunch")`, hence the + # indexes in the search vector. (priority "D" is the default, and never shown.) + book = self._create_book("Book", "Mary", subtitle="Long", series="Bunch") + self.assertEqual(book.search_vector, "'book':1A 'bunch':4 'long':2B 'mary':3C") + + def test_search_vector_parse_book(self): + """book parts are parsed in english""" + # FIXME: at some point this should stop being the default. + book = self._create_book( + "Edition", "Editor", series="Castle", subtitle="Writing" + ) + self.assertEqual( + book.search_vector, "'castl':4 'edit':1A 'editor':3C 'write':2B" + ) + + def test_search_vector_parse_author(self): + """author name is not stem'd or affected by stop words""" + book = self._create_book("Writing", "Writes") + self.assertEqual(book.search_vector, "'write':1A 'writes':2C") + + book = self._create_book("She Is Writing", "She Writes") + self.assertEqual(book.search_vector, "'she':4C 'write':3A 'writes':5C") + + def test_search_vector_parse_title_empty(self): + """empty parse in English retried as simple title""" + book = self._create_book("Here We", "John") + self.assertEqual(book.search_vector, "'here':1A 'john':3C 'we':2A") + + book = self._create_book("Hear We Come", "John") + self.assertEqual(book.search_vector, "'come':3A 'hear':1A 'john':4C") + + @staticmethod + def _create_book( + title, author_name, /, *, subtitle="", series="", author_alias=None + ): + """quickly create a book""" + work = models.Work.objects.create(title="work") + author = models.Author.objects.create( + name=author_name, aliases=author_alias or [] + ) + edition = models.Edition.objects.create( + title=title, + series=series or None, + subtitle=subtitle or None, + isbn_10="0000000000", + parent_work=work, + ) + edition.authors.add(author) + edition.save(broadcast=False) + edition.refresh_from_db() + return edition + + class SearchVectorTriggers(TestCase): """look for books as they change""" @@ -222,8 +285,8 @@ class SearchVectorTriggers(TestCase): """wrapper around search_title_author""" return self._search(query, return_first=True) - # pylint: disable-next=no-self-use - def _search(self, query, *, return_first=False): + @staticmethod + def _search(query, *, return_first=False): """wrapper around search_title_author""" return book_search.search_title_author( query, min_confidence=0, return_first=return_first From b5805accacb497be62cb4e7bb54a52258a1d12e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sat, 25 Nov 2023 21:47:13 -0300 Subject: [PATCH 014/200] Minor improvements to bookwyrm_book trigger code - do not COALESCE columns that cannot be NULL - do not bring bookwyrm_book to author names JOIN - add comments documenting the four steps --- ...grate_search_vec_triggers_to_pgtriggers.py | 4 ++-- bookwyrm/models/book.py | 21 ++++++++++--------- bookwyrm/tests/test_book_search.py | 16 +++++++++----- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py index ddfe74a8b..5e798b654 100644 --- a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py +++ b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py @@ -32,8 +32,8 @@ class Migration(migrations.Migration): trigger=pgtrigger.compiler.Trigger( name="update_search_vector_on_book_edit", sql=pgtrigger.compiler.UpsertTriggerSql( - func="new.search_vector := coalesce(nullif(setweight(to_tsvector('english', coalesce(new.title, '')), 'A'), ''), setweight(to_tsvector('simple', coalesce(new.title, '')), 'A')) || setweight(to_tsvector('english', coalesce(new.subtitle, '')), 'B') || (SELECT setweight(to_tsvector('simple', coalesce(array_to_string(array_agg(bookwyrm_author.name), ' '), '')), 'C') FROM bookwyrm_book LEFT OUTER JOIN bookwyrm_book_authors ON bookwyrm_book.id = bookwyrm_book_authors.book_id LEFT OUTER JOIN bookwyrm_author ON bookwyrm_book_authors.author_id = bookwyrm_author.id WHERE bookwyrm_book.id = new.id ) || setweight(to_tsvector('english', coalesce(new.series, '')), 'D');RETURN NEW;", - hash="9c898d46dfb7492ecd18f6c692bbecfa548f0e85", + func="new.search_vector := setweight(coalesce(nullif(to_tsvector('english', new.title), ''), to_tsvector('simple', new.title)), 'A') || setweight(to_tsvector('english', coalesce(new.subtitle, '')), 'B') || (SELECT setweight(to_tsvector('simple', coalesce(array_to_string(array_agg(bookwyrm_author.name), ' '), '')), 'C') FROM bookwyrm_author LEFT JOIN bookwyrm_book_authors ON bookwyrm_author.id = bookwyrm_book_authors.author_id WHERE bookwyrm_book_authors.book_id = new.id ) || setweight(to_tsvector('english', coalesce(new.series, '')), 'D');RETURN NEW;", + hash="77d6399497c0a89b0bf09d296e33c396da63705c", operation='INSERT OR UPDATE OF "title", "subtitle", "series", "search_vector"', pgid="pgtrigger_update_search_vector_on_book_edit_bec58", table="bookwyrm_book", diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index ed26752e3..e167e2138 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -247,19 +247,20 @@ class Book(BookDataModel): | pgtrigger.UpdateOf("title", "subtitle", "series", "search_vector"), func=format_trigger( """new.search_vector := - COALESCE( - NULLIF(setweight(to_tsvector('english', COALESCE(new.title, '')), 'A'), ''), - setweight(to_tsvector('simple', COALESCE(new.title, '')), 'A') - ) || + -- title, with priority A (parse in English, default to simple if empty) + setweight(COALESCE(nullif( + to_tsvector('english', new.title), ''), + to_tsvector('simple', new.title)), 'A') || + -- subtitle, with priority B (always in English?) setweight(to_tsvector('english', COALESCE(new.subtitle, '')), 'B') || + -- list of authors, with priority C (TODO: add aliases?, bookwyrm-social#3063) (SELECT setweight(to_tsvector('simple', COALESCE(array_to_string(ARRAY_AGG(bookwyrm_author.name), ' '), '')), 'C') - FROM bookwyrm_book - LEFT OUTER JOIN bookwyrm_book_authors - ON bookwyrm_book.id = bookwyrm_book_authors.book_id - LEFT OUTER JOIN bookwyrm_author - ON bookwyrm_book_authors.author_id = bookwyrm_author.id - WHERE bookwyrm_book.id = new.id + FROM bookwyrm_author + LEFT JOIN bookwyrm_book_authors + ON bookwyrm_author.id = bookwyrm_book_authors.author_id + WHERE bookwyrm_book_authors.book_id = new.id ) || + --- last: series name, with lowest priority setweight(to_tsvector('english', COALESCE(new.series, '')), 'D'); RETURN new; """ diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index 99b62f0a0..e9f550a88 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -178,15 +178,17 @@ class SearchVectorTest(TestCase): book = self._create_book("Hear We Come", "John") self.assertEqual(book.search_vector, "'come':3A 'hear':1A 'john':4C") + def test_search_vector_no_author(self): + """book with no authors gets processed normally""" + book = self._create_book("Book", None, series="Bunch") + self.assertEqual(book.search_vector, "'book':1A 'bunch':2") + @staticmethod def _create_book( title, author_name, /, *, subtitle="", series="", author_alias=None ): """quickly create a book""" work = models.Work.objects.create(title="work") - author = models.Author.objects.create( - name=author_name, aliases=author_alias or [] - ) edition = models.Edition.objects.create( title=title, series=series or None, @@ -194,8 +196,12 @@ class SearchVectorTest(TestCase): isbn_10="0000000000", parent_work=work, ) - edition.authors.add(author) - edition.save(broadcast=False) + if author_name is not None: + author = models.Author.objects.create( + name=author_name, aliases=author_alias or [] + ) + edition.authors.add(author) + edition.save(broadcast=False) edition.refresh_from_db() return edition From d6eb390ceed8e6f63926aa8b54a4ef9314b93c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 26 Nov 2023 15:57:51 -0300 Subject: [PATCH 015/200] Add test that forces `book_authors_search_vector_trigger` to execute --- bookwyrm/tests/test_book_search.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index e9f550a88..42e57f773 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -275,6 +275,29 @@ class SearchVectorTriggers(TestCase): self.assertEqual(self.edition, self._search_first("Mozilla")) self.assertEqual(self.edition, self._search_first("Name")) + def test_search_after_author_add_remove_sql(self): + """add/remove author through SQL to ensure execution of book_authors trigger""" + # Tests calling edition.save(), above, pass even if the trigger in + # bookwyrm_book_authors is removed (probably because they trigger the one + # in bookwyrm_book directly). Here we make sure to exercise the former. + new_author = models.Author.objects.create(name="Mozilla") + + with connection.cursor() as cursor: + cursor.execute( + "DELETE FROM bookwyrm_book_authors WHERE book_id = %s", + [self.edition.id], + ) + self.assertFalse(self._search("Name")) + self.assertFalse(self._search("Mozilla")) + + with connection.cursor() as cursor: + cursor.execute( + "INSERT INTO bookwyrm_book_authors (book_id,author_id) VALUES (%s,%s)", + [self.edition.id, new_author.id], + ) + self.assertFalse(self._search("Name")) + self.assertEqual(self.edition, self._search_first("Mozilla")) + def test_search_after_updated_author_name(self): """book found under new author name""" self.assertEqual(self.edition, self._search_first("Name")) From 31a78a5c9efae9559eeb93cc05d18f76869f4ce7 Mon Sep 17 00:00:00 2001 From: Matt Lehrer Date: Thu, 30 Nov 2023 11:12:42 +0100 Subject: [PATCH 016/200] linted --- bookwyrm/tests/views/books/test_editions.py | 26 +++++++++++++++------ bookwyrm/views/books/editions.py | 4 ++-- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py index bbae517ac..ba380c0bc 100644 --- a/bookwyrm/tests/views/books/test_editions.py +++ b/bookwyrm/tests/views/books/test_editions.py @@ -139,14 +139,17 @@ class BookViews(TestCase): work = models.Work.objects.create(title="test work") edition1 = models.Edition.objects.create(title="first ed", parent_work=work) edition2 = models.Edition.objects.create(title="second ed", parent_work=work) - + models.ReviewRating.objects.create( book=edition1, user=self.local_user, rating=3, ) - self.assertIsInstance(models.ReviewRating.objects.get(user=self.local_user, book=edition1), models.ReviewRating) + self.assertIsInstance( + models.ReviewRating.objects.get(user=self.local_user, book=edition1), + models.ReviewRating, + ) with self.assertRaises(models.ReviewRating.DoesNotExist): models.ReviewRating.objects.get(user=self.local_user, book=edition2) @@ -154,7 +157,10 @@ class BookViews(TestCase): request.user = self.local_user views.switch_edition(request) - self.assertIsInstance(models.ReviewRating.objects.get(user=self.local_user, book=edition2), models.ReviewRating) + self.assertIsInstance( + models.ReviewRating.objects.get(user=self.local_user, book=edition2), + models.ReviewRating, + ) with self.assertRaises(models.ReviewRating.DoesNotExist): models.ReviewRating.objects.get(user=self.local_user, book=edition1) @@ -167,16 +173,19 @@ class BookViews(TestCase): work = models.Work.objects.create(title="test work") edition1 = models.Edition.objects.create(title="first ed", parent_work=work) edition2 = models.Edition.objects.create(title="second ed", parent_work=work) - + models.Review.objects.create( book=edition1, user=self.local_user, name="blah", rating=3, - content="not bad" + content="not bad", ) - self.assertIsInstance(models.Review.objects.get(user=self.local_user, book=edition1), models.Review) + self.assertIsInstance( + models.Review.objects.get(user=self.local_user, book=edition1), + models.Review, + ) with self.assertRaises(models.Review.DoesNotExist): models.Review.objects.get(user=self.local_user, book=edition2) @@ -184,6 +193,9 @@ class BookViews(TestCase): request.user = self.local_user views.switch_edition(request) - self.assertIsInstance(models.Review.objects.get(user=self.local_user, book=edition2), models.Review) + self.assertIsInstance( + models.Review.objects.get(user=self.local_user, book=edition2), + models.Review, + ) with self.assertRaises(models.Review.DoesNotExist): models.Review.objects.get(user=self.local_user, book=edition1) diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index 2bbb1c579..572dc9786 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -107,9 +107,9 @@ def switch_edition(request): book__parent_work=new_edition.parent_work, user=request.user ) for review in reviews.all(): - # because ratings are a subclass of reviews, + # because ratings are a subclass of reviews, # this will pick up both ratings and reviews review.book = new_edition - review.save() + review.save() return redirect(f"/book/{new_edition.id}") From d6f7f76c4d8c35ebafb994f6f4ee01b932ae2bf0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 11:37:01 -0800 Subject: [PATCH 017/200] Removes outdated/unused version and updating code I had the bright idea of creating this update script but it doesn't work and hasn't been maintained, so it's just sitting there causing confusing and requiring weird things to exist in other places. Now, the unused `version` field can be removed and I can scrap the management command for getting versions. --- .../management/commands/instance_version.py | 54 ------------------- ..._version_sitesettings_available_version.py | 18 +++++++ bookwyrm/models/site.py | 2 +- bookwyrm/views/admin/dashboard.py | 18 ++----- update.sh | 37 ------------- 5 files changed, 24 insertions(+), 105 deletions(-) delete mode 100644 bookwyrm/management/commands/instance_version.py create mode 100644 bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py delete mode 100755 update.sh diff --git a/bookwyrm/management/commands/instance_version.py b/bookwyrm/management/commands/instance_version.py deleted file mode 100644 index ca150d640..000000000 --- a/bookwyrm/management/commands/instance_version.py +++ /dev/null @@ -1,54 +0,0 @@ -""" Get your admin code to allow install """ -from django.core.management.base import BaseCommand - -from bookwyrm import models -from bookwyrm.settings import VERSION - - -# pylint: disable=no-self-use -class Command(BaseCommand): - """command-line options""" - - help = "What version is this?" - - def add_arguments(self, parser): - """specify which function to run""" - parser.add_argument( - "--current", - action="store_true", - help="Version stored in database", - ) - parser.add_argument( - "--target", - action="store_true", - help="Version stored in settings", - ) - parser.add_argument( - "--update", - action="store_true", - help="Update database version", - ) - - # pylint: disable=unused-argument - def handle(self, *args, **options): - """execute init""" - site = models.SiteSettings.objects.get() - current = site.version or "0.0.1" - target = VERSION - if options.get("current"): - print(current) - return - - if options.get("target"): - print(target) - return - - if options.get("update"): - site.version = target - site.save() - return - - if current != target: - print(f"{current}/{target}") - else: - print(current) diff --git a/bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py b/bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py new file mode 100644 index 000000000..219ae32f6 --- /dev/null +++ b/bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.23 on 2024-01-02 19:36 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0191_merge_20240102_0326'), + ] + + operations = [ + migrations.RenameField( + model_name='sitesettings', + old_name='version', + new_name='available_version', + ), + ] diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index bd53f1f07..7ca7e0015 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -45,7 +45,7 @@ class SiteSettings(SiteModel): default_theme = models.ForeignKey( "Theme", null=True, blank=True, on_delete=models.SET_NULL ) - version = models.CharField(null=True, blank=True, max_length=10) + available_version = models.CharField(null=True, blank=True, max_length=10) # admin setup options install_mode = models.BooleanField(default=False) diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index 9d256fc6c..c5648ff11 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -15,7 +15,6 @@ from django.views import View from csp.decorators import csp_update from bookwyrm import models, settings -from bookwyrm.connectors.abstract_connector import get_data from bookwyrm.utils import regex @@ -59,18 +58,11 @@ class Dashboard(View): == site._meta.get_field("privacy_policy").get_default() ) - # check version - - try: - release = get_data(settings.RELEASE_API, timeout=3) - available_version = release.get("tag_name", None) - if available_version and version.parse(available_version) > version.parse( - settings.VERSION - ): - data["current_version"] = settings.VERSION - data["available_version"] = available_version - except: # pylint: disable= bare-except - pass + if site.available_version and version.parse(site.available_version) > version.parse( + settings.VERSION + ): + data["current_version"] = settings.VERSION + data["available_version"] = site.available_version return TemplateResponse(request, "settings/dashboard/dashboard.html", data) diff --git a/update.sh b/update.sh deleted file mode 100755 index 727ce1b24..000000000 --- a/update.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -set -e - -# determine inital and target versions -initial_version="`./bw-dev runweb python manage.py instance_version --current`" -target_version="`./bw-dev runweb python manage.py instance_version --target`" - -initial_version="`echo $initial_version | tail -n 1 | xargs`" -target_version="`echo $target_version | tail -n 1 | xargs`" -if [[ "$initial_version" = "$target_version" ]]; then - echo "Already up to date; version $initial_version" - exit -fi - -echo "---------------------------------------" -echo "Updating from version: $initial_version" -echo ".......... to version: $target_version" -echo "---------------------------------------" - -function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } - -# execute scripts between initial and target -for version in `ls -A updates/ | sort -V `; do - if version_gt $initial_version $version; then - # too early - continue - fi - if version_gt $version $target_version; then - # too late - continue - fi - echo "Running tasks for version $version" - ./updates/$version -done - -./bw-dev runweb python manage.py instance_version --update -echo "✨ ----------- Done! --------------- ✨" From 5509941aa4d14fc5422644cac5e8ff658e1fbd5b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 12:23:32 -0800 Subject: [PATCH 018/200] Adds schedule-able task to check for version updates --- ..._version_sitesettings_available_version.py | 8 +++---- bookwyrm/models/site.py | 14 ++++++++++++ .../settings/dashboard/dashboard.html | 4 ++++ .../dashboard/warnings/check_for_updates.html | 22 +++++++++++++++++++ bookwyrm/views/admin/dashboard.py | 21 +++++++++++++++++- 5 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html diff --git a/bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py b/bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py index 219ae32f6..db67b4e92 100644 --- a/bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py +++ b/bookwyrm/migrations/0192_rename_version_sitesettings_available_version.py @@ -6,13 +6,13 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0191_merge_20240102_0326'), + ("bookwyrm", "0191_merge_20240102_0326"), ] operations = [ migrations.RenameField( - model_name='sitesettings', - old_name='version', - new_name='available_version', + model_name="sitesettings", + old_name="version", + new_name="available_version", ), ] diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index 7ca7e0015..f82a4d94b 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -10,8 +10,11 @@ from django.dispatch import receiver from django.utils import timezone from model_utils import FieldTracker +from bookwyrm.connectors.abstract_connector import get_data from bookwyrm.preview_images import generate_site_preview_image_task from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES, STATIC_FULL_URL +from bookwyrm.settings import RELEASE_API +from bookwyrm.tasks import app, MISC from .base_model import BookWyrmModel, new_access_code from .user import User from .fields import get_absolute_url @@ -244,3 +247,14 @@ def preview_image(instance, *args, **kwargs): if len(changed_fields) > 0: generate_site_preview_image_task.delay() + + +@app.task(queue=MISC) +def check_for_updates_task(): + """ See if git remote knows about a new version """ + site = SiteSettings.objects.get() + release = get_data(RELEASE_API, timeout=3) + available_version = release.get("tag_name", None) + if available_version: + site.available_version = available_version + site.save(update_fields=["available_version"]) diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html index 4c109c7e1..d43b3bade 100644 --- a/bookwyrm/templates/settings/dashboard/dashboard.html +++ b/bookwyrm/templates/settings/dashboard/dashboard.html @@ -45,6 +45,10 @@ {% include 'settings/dashboard/warnings/update_version.html' with warning_level="warning" fullwidth=True %} {% endif %} + {% if schedule_form %} + {% include 'settings/dashboard/warnings/check_for_updates.html' with warning_level="success" fullwidth=True %} + {% endif %} + {% if missing_privacy or missing_conduct %}
{% if missing_privacy %} diff --git a/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html b/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html new file mode 100644 index 000000000..07f11a62d --- /dev/null +++ b/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html @@ -0,0 +1,22 @@ +{% extends 'settings/dashboard/warnings/layout.html' %} +{% load i18n %} + +{% block warning_text %} + +
+ {% csrf_token %} + +

+ {% blocktrans trimmed with current=current_version available=available_version %} + Check for available version updates? (Recommended) + {% endblocktrans %} +

+ + {{ schedule_form.every.as_hidden }} + {{ schedule_form.period.as_hidden }} + + +
+ +{% endblock %} + diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index c5648ff11..ea0675f59 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -6,15 +6,18 @@ from dateutil.parser import parse from packaging import version from django.contrib.auth.decorators import login_required, permission_required +from django.db import transaction from django.db.models import Q +from django.shortcuts import redirect from django.template.response import TemplateResponse from django.utils import timezone from django.utils.decorators import method_decorator from django.views import View +from django_celery_beat.models import PeriodicTask from csp.decorators import csp_update -from bookwyrm import models, settings +from bookwyrm import forms, models, settings from bookwyrm.utils import regex @@ -64,8 +67,24 @@ class Dashboard(View): data["current_version"] = settings.VERSION data["available_version"] = site.available_version + if not PeriodicTask.objects.filter(name="check-for-updates").exists(): + data["schedule_form"] = forms.IntervalScheduleForm({"every": 1, "period": "days"}) + return TemplateResponse(request, "settings/dashboard/dashboard.html", data) + def post(self, request): + """ Create a schedule task to check for updates """ + schedule_form = forms.IntervalScheduleForm(request.POST) + + with transaction.atomic(): + schedule = schedule_form.save(request) + PeriodicTask.objects.get_or_create( + interval=schedule, + name="check-for-updates", + task="bookwyrm.models.site.check_for_updates_task" + ) + return redirect("settings-dashboard") + def get_charts_and_stats(request): """Defines the dashboard charts""" From f36af42f414196f3e12d30a843470979cbcb9713 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 13:05:44 -0800 Subject: [PATCH 019/200] Adds view to see scheduled tasks --- bookwyrm/models/site.py | 2 +- bookwyrm/templates/settings/layout.html | 4 + bookwyrm/templates/settings/schedules.html | 116 +++++++++++++++++++++ bookwyrm/urls.py | 5 + bookwyrm/views/__init__.py | 1 + bookwyrm/views/admin/dashboard.py | 14 +-- bookwyrm/views/admin/schedule.py | 23 ++++ 7 files changed, 158 insertions(+), 7 deletions(-) create mode 100644 bookwyrm/templates/settings/schedules.html create mode 100644 bookwyrm/views/admin/schedule.py diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index f82a4d94b..ad0dbff64 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -251,7 +251,7 @@ def preview_image(instance, *args, **kwargs): @app.task(queue=MISC) def check_for_updates_task(): - """ See if git remote knows about a new version """ + """See if git remote knows about a new version""" site = SiteSettings.objects.get() release = get_data(RELEASE_API, timeout=3) available_version = release.get("tag_name", None) diff --git a/bookwyrm/templates/settings/layout.html b/bookwyrm/templates/settings/layout.html index dcaaaeb38..70c7ef0f4 100644 --- a/bookwyrm/templates/settings/layout.html +++ b/bookwyrm/templates/settings/layout.html @@ -85,6 +85,10 @@ {% url 'settings-celery' as url %} {% trans "Celery status" %} +
  • + {% url 'settings-schedules' as url %} + {% trans "Scheduled tasks" %} +
  • {% url 'settings-email-config' as url %} {% trans "Email Configuration" %} diff --git a/bookwyrm/templates/settings/schedules.html b/bookwyrm/templates/settings/schedules.html new file mode 100644 index 000000000..fe096092d --- /dev/null +++ b/bookwyrm/templates/settings/schedules.html @@ -0,0 +1,116 @@ +{% extends 'settings/layout.html' %} +{% load i18n %} +{% load humanize %} +{% load utilities %} + +{% block title %} +{% trans "Scheduled tasks" %} +{% endblock %} + +{% block header %} +{% trans "Scheduled tasks" %} +{% endblock %} + +{% block panel %} + +
    +

    {% trans "Tasks" %}

    +
    + + + + + + + + + + + {% for task in tasks %} + + + + + + + + + + {% empty %} + + + + {% endfor %} +
    + {% trans "Name" %} + + {% trans "Celery task" %} + + {% trans "Date changed" %} + + {% trans "Last run at" %} + + {% trans "Schedule" %} + + {% trans "Schedule ID" %} + + {% trans "Enabled" %} +
    + {{ task.name }} + + {{ task.task }} + + {{ task.date_changed }} + + {{ task.last_run_at }} + + {% firstof task.interval task.crontab "None" %} + + {{ task.interval.id }} + + {{ task.enabled|yesno }} +
    + {% trans "No scheduled tasks" %} +
    +
    +
    + +
    +

    {% trans "Schedules" %}

    +
    + + + + + + + {% for schedule in schedules %} + + + + + + {% empty %} + + + + {% endfor %} +
    + {% trans "ID" %} + + {% trans "Schedule" %} + + {% trans "Tasks" %} +
    + {{ schedule.id }} + + {{ schedule }} + + {{ schedule.periodictask_set.count }} +
    + {% trans "No schedules found" %} +
    +
    +
    + +{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 76e60245b..64742347a 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -359,6 +359,11 @@ urlpatterns = [ re_path( r"^settings/celery/ping/?$", views.celery_ping, name="settings-celery-ping" ), + re_path( + r"^settings/schedules/?$", + views.ScheduledTasks.as_view(), + name="settings-schedules", + ), re_path( r"^settings/email-config/?$", views.EmailConfig.as_view(), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 3be813208..d77f2675f 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -5,6 +5,7 @@ from .admin.announcements import EditAnnouncement, delete_announcement from .admin.automod import AutoMod, automod_delete, run_automod from .admin.automod import schedule_automod_task, unschedule_automod_task from .admin.celery_status import CeleryStatus, celery_ping +from .admin.schedule import ScheduledTasks from .admin.dashboard import Dashboard from .admin.federation import Federation, FederatedServer from .admin.federation import AddFederatedServer, ImportServerBlocklist diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index ea0675f59..4b2575fa6 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -61,19 +61,21 @@ class Dashboard(View): == site._meta.get_field("privacy_policy").get_default() ) - if site.available_version and version.parse(site.available_version) > version.parse( - settings.VERSION - ): + if site.available_version and version.parse( + site.available_version + ) > version.parse(settings.VERSION): data["current_version"] = settings.VERSION data["available_version"] = site.available_version if not PeriodicTask.objects.filter(name="check-for-updates").exists(): - data["schedule_form"] = forms.IntervalScheduleForm({"every": 1, "period": "days"}) + data["schedule_form"] = forms.IntervalScheduleForm( + {"every": 1, "period": "days"} + ) return TemplateResponse(request, "settings/dashboard/dashboard.html", data) def post(self, request): - """ Create a schedule task to check for updates """ + """Create a schedule task to check for updates""" schedule_form = forms.IntervalScheduleForm(request.POST) with transaction.atomic(): @@ -81,7 +83,7 @@ class Dashboard(View): PeriodicTask.objects.get_or_create( interval=schedule, name="check-for-updates", - task="bookwyrm.models.site.check_for_updates_task" + task="bookwyrm.models.site.check_for_updates_task", ) return redirect("settings-dashboard") diff --git a/bookwyrm/views/admin/schedule.py b/bookwyrm/views/admin/schedule.py new file mode 100644 index 000000000..ce5944ee5 --- /dev/null +++ b/bookwyrm/views/admin/schedule.py @@ -0,0 +1,23 @@ +""" Scheduled celery tasks """ +from django.contrib.auth.decorators import login_required, permission_required +from django.template.response import TemplateResponse +from django.utils.decorators import method_decorator +from django.views import View +from django_celery_beat.models import PeriodicTask, IntervalSchedule + + +@method_decorator(login_required, name="dispatch") +@method_decorator( + permission_required("bookwyrm.edit_instance_settings", raise_exception=True), + name="dispatch", +) +# pylint: disable=no-self-use +class ScheduledTasks(View): + """Manage automated flagging""" + + def get(self, request): + """view schedules""" + data = {} + data["tasks"] = PeriodicTask.objects.all() + data["schedules"] = IntervalSchedule.objects.all() + return TemplateResponse(request, "settings/schedules.html", data) From 8be9e91d2162871faae0aaabbecdf8da449b6c2d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 13:16:53 -0800 Subject: [PATCH 020/200] Re-use schedules rather than creating new ones --- bookwyrm/views/admin/automod.py | 4 ++-- bookwyrm/views/admin/dashboard.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bookwyrm/views/admin/automod.py b/bookwyrm/views/admin/automod.py index 9a32dd9ee..58818ad9b 100644 --- a/bookwyrm/views/admin/automod.py +++ b/bookwyrm/views/admin/automod.py @@ -6,7 +6,7 @@ from django.template.response import TemplateResponse from django.utils.decorators import method_decorator from django.views import View from django.views.decorators.http import require_POST -from django_celery_beat.models import PeriodicTask +from django_celery_beat.models import PeriodicTask, IntervalSchedule from bookwyrm import forms, models @@ -54,7 +54,7 @@ def schedule_automod_task(request): return TemplateResponse(request, "settings/automod/rules.html", data) with transaction.atomic(): - schedule = form.save(request) + schedule, _ = IntervalSchedule.objects.get_or_create(**form.cleaned_data) PeriodicTask.objects.get_or_create( interval=schedule, name="automod-task", diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index 4b2575fa6..a4c630067 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -13,7 +13,7 @@ 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_celery_beat.models import PeriodicTask +from django_celery_beat.models import PeriodicTask, IntervalSchedule from csp.decorators import csp_update @@ -79,7 +79,9 @@ class Dashboard(View): schedule_form = forms.IntervalScheduleForm(request.POST) with transaction.atomic(): - schedule = schedule_form.save(request) + schedule, _ = IntervalSchedule.objects.get_or_create( + **schedule_form.cleaned_data + ) PeriodicTask.objects.get_or_create( interval=schedule, name="check-for-updates", From 193a1c7d54564c3ab35be20e27681566c2305581 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 13:28:25 -0800 Subject: [PATCH 021/200] updates wording and fixes get or create logic --- VERSION | 2 +- .../settings/dashboard/warnings/check_for_updates.html | 4 ++-- bookwyrm/views/admin/dashboard.py | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 39e898a4f..ee6cdce3c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.1 +0.6.1 diff --git a/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html b/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html index 07f11a62d..f0a2a8013 100644 --- a/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html +++ b/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html @@ -8,14 +8,14 @@

    {% blocktrans trimmed with current=current_version available=available_version %} - Check for available version updates? (Recommended) + Would you like to automatically check for new BookWyrm releases? (recommended) {% endblocktrans %}

    {{ schedule_form.every.as_hidden }} {{ schedule_form.period.as_hidden }} - + {% endblock %} diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index a4c630067..21b19bf16 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -77,6 +77,8 @@ class Dashboard(View): def post(self, request): """Create a schedule task to check for updates""" schedule_form = forms.IntervalScheduleForm(request.POST) + if not schedule_form.is_valid(): + raise schedule_form.ValidationError(schedule_form.errors) with transaction.atomic(): schedule, _ = IntervalSchedule.objects.get_or_create( From d287581620a5d1238988803d05ce2ce9c6cbf52b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 13:31:18 -0800 Subject: [PATCH 022/200] Fixes html validation error --- .../settings/dashboard/warnings/check_for_updates.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html b/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html index f0a2a8013..00f320824 100644 --- a/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html +++ b/bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html @@ -1,6 +1,8 @@ {% extends 'settings/dashboard/warnings/layout.html' %} {% load i18n %} +{% block warning_link %}#{% endblock %} + {% block warning_text %}
    From 6cd2c9113506cf71756fc1bb5f025297fbcc4f53 Mon Sep 17 00:00:00 2001 From: Wesley Aptekar-Cassels Date: Thu, 4 Jan 2024 18:58:12 -0500 Subject: [PATCH 023/200] Allow page numbers to be text, instead of integers. Fixes: #2640 --- .../0192_make_page_positions_text.py | 23 +++++++++++++++++++ bookwyrm/models/status.py | 10 ++++---- .../snippets/create_status/quotation.html | 6 ++--- bookwyrm/tests/views/books/test_book.py | 8 ++++--- 4 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 bookwyrm/migrations/0192_make_page_positions_text.py diff --git a/bookwyrm/migrations/0192_make_page_positions_text.py b/bookwyrm/migrations/0192_make_page_positions_text.py new file mode 100644 index 000000000..940a9e941 --- /dev/null +++ b/bookwyrm/migrations/0192_make_page_positions_text.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.23 on 2024-01-04 23:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0191_merge_20240102_0326"), + ] + + operations = [ + migrations.AlterField( + model_name="quotation", + name="endposition", + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name="quotation", + name="position", + field=models.TextField(blank=True, null=True), + ), + ] diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index cc44fe2bf..f33c32824 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -338,11 +338,13 @@ class Quotation(BookStatus): quote = fields.HtmlField() raw_quote = models.TextField(blank=True, null=True) - position = models.IntegerField( - validators=[MinValueValidator(0)], null=True, blank=True + position = models.TextField( + null=True, + blank=True, ) - endposition = models.IntegerField( - validators=[MinValueValidator(0)], null=True, blank=True + endposition = models.TextField( + null=True, + blank=True, ) position_mode = models.CharField( max_length=3, diff --git a/bookwyrm/templates/snippets/create_status/quotation.html b/bookwyrm/templates/snippets/create_status/quotation.html index bd1d817ad..dc17585a9 100644 --- a/bookwyrm/templates/snippets/create_status/quotation.html +++ b/bookwyrm/templates/snippets/create_status/quotation.html @@ -56,8 +56,7 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j Date: Tue, 9 Jan 2024 15:31:05 +0530 Subject: [PATCH 024/200] Issue-3187: changes --- bookwyrm/templates/feed/feed.html | 2 +- bookwyrm/views/feed.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html index 7ecf10b70..820314b7a 100644 --- a/bookwyrm/templates/feed/feed.html +++ b/bookwyrm/templates/feed/feed.html @@ -33,7 +33,7 @@ - {% if request.user.show_goal and not goal and tab.key == 'home' %} + {% if request.user.show_goal and not goal and tab.key == 'home' and has_read_throughs %} {% now 'Y' as year %}
    {% include 'feed/goal_card.html' with year=year %} diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 17218b93e..381d233e9 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -52,6 +52,8 @@ class Feed(View): suggestions = suggested_users.get_suggestions(request.user) + readthroughs = models.ReadThrough.objects.filter(user=request.user) + data = { **feed_page_data(request.user), **{ @@ -66,6 +68,7 @@ class Feed(View): "path": f"/{tab['key']}", "annual_summary_year": get_annual_summary_year(), "has_tour": True, + "has_read_throughs": True if len(readthroughs) else False, }, } return TemplateResponse(request, "feed/feed.html", data) From eb13eb98828509b96c34fbbcae272d37050789f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sat, 13 Jan 2024 18:55:13 +0100 Subject: [PATCH 025/200] Invalidate `active_shelf` when switching editions --- bookwyrm/views/books/editions.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index 54d1bd84c..0d59d0bcc 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -3,6 +3,7 @@ from functools import reduce import operator from django.contrib.auth.decorators import login_required +from django.core.cache import cache as django_cache from django.core.paginator import Paginator from django.db import transaction from django.db.models import Q @@ -103,4 +104,10 @@ def switch_edition(request): readthrough.book = new_edition readthrough.save() + django_cache.delete_many( + [ + f"active_shelf-{request.user.id}-{book_id}" + for book_id in new_edition.parent_work.editions.values_list("id", flat=True) + ] + ) return redirect(f"/book/{new_edition.id}") From cbd08127efe8105576be779ad7f0fa938878a36a Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 14 Jan 2024 12:14:44 +1100 Subject: [PATCH 026/200] initial work on fixing user exports with s3 - custom storages - tar.gz within bucket using s3_tar - slightly changes export directory structure - major problems still outstanding re delivering s3 files to end users --- .../migrations/0192_auto_20240114_0055.py | 53 ++ bookwyrm/models/bookwyrm_export_job.py | 460 ++++++++++++------ bookwyrm/models/job.py | 7 +- bookwyrm/settings.py | 1 + bookwyrm/storage_backends.py | 14 + bookwyrm/templatetags/utilities.py | 27 +- exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 | Bin 0 -> 3820 bytes exports/ba15a57f-e29e-4a29-aaf4-306b66960273 | Bin 0 -> 41614 bytes requirements.txt | 1 + 9 files changed, 408 insertions(+), 155 deletions(-) create mode 100644 bookwyrm/migrations/0192_auto_20240114_0055.py create mode 100644 exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 create mode 100644 exports/ba15a57f-e29e-4a29-aaf4-306b66960273 diff --git a/bookwyrm/migrations/0192_auto_20240114_0055.py b/bookwyrm/migrations/0192_auto_20240114_0055.py new file mode 100644 index 000000000..f4d324f7f --- /dev/null +++ b/bookwyrm/migrations/0192_auto_20240114_0055.py @@ -0,0 +1,53 @@ +# Generated by Django 3.2.23 on 2024-01-14 00:55 + +import bookwyrm.storage_backends +import django.core.serializers.json +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0191_merge_20240102_0326'), + ] + + operations = [ + migrations.AddField( + model_name='bookwyrmexportjob', + name='export_json', + field=models.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder, null=True), + ), + migrations.AddField( + model_name='bookwyrmexportjob', + name='json_completed', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='bookwyrmexportjob', + name='export_data', + field=models.FileField(null=True, storage=bookwyrm.storage_backends.ExportsFileStorage, upload_to=''), + ), + migrations.CreateModel( + name='AddFileToTar', + fields=[ + ('childjob_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.childjob')), + ('parent_export_job', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='child_edition_export_jobs', to='bookwyrm.bookwyrmexportjob')), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.childjob',), + ), + migrations.CreateModel( + name='AddBookToUserExportJob', + fields=[ + ('childjob_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.childjob')), + ('edition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.edition')), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.childjob',), + ), + ] diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 1f6085e0c..12a9792e2 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -2,94 +2,347 @@ import dataclasses import logging +import boto3 +from s3_tar import S3Tar from uuid import uuid4 -from django.db.models import FileField +from django.db.models import CASCADE, BooleanField, FileField, ForeignKey, JSONField from django.db.models import Q from django.core.serializers.json import DjangoJSONEncoder -from django.core.files.base import ContentFile +from django.core.files.base import ContentFile, File +from django.utils import timezone + +from bookwyrm import settings, storage_backends from bookwyrm.models import AnnualGoal, ReadThrough, ShelfBook, List, ListItem from bookwyrm.models import Review, Comment, Quotation from bookwyrm.models import Edition from bookwyrm.models import UserFollows, User, UserBlocks -from bookwyrm.models.job import ParentJob, ParentTask +from bookwyrm.models.job import ParentJob, ChildJob, ParentTask, SubTask from bookwyrm.tasks import app, IMPORTS from bookwyrm.utils.tar import BookwyrmTarFile logger = logging.getLogger(__name__) - class BookwyrmExportJob(ParentJob): """entry for a specific request to export a bookwyrm user""" - export_data = FileField(null=True) + if settings.USE_S3: + storage = storage_backends.ExportsS3Storage + else: + storage = storage_backends.ExportsFileStorage + + export_data = FileField(null=True, storage=storage) # use custom storage backend here + export_json = JSONField(null=True, encoder=DjangoJSONEncoder) + json_completed = BooleanField(default=False) + def start_job(self): """Start the job""" - start_export_task.delay(job_id=self.id, no_children=True) - return self + task = start_export_task.delay(job_id=self.id, no_children=False) + self.task_id = task.id + self.save(update_fields=["task_id"]) + + + def notify_child_job_complete(self): + """let the job know when the items get work done""" + + if self.complete: + return + + self.updated_date = timezone.now() + self.save(update_fields=["updated_date"]) + + if not self.complete and self.has_completed: + if not self.json_completed: + + try: + self.json_completed = True + self.save(update_fields=["json_completed"]) + + # add json file to tarfile + tar_job = AddFileToTar.objects.create( + parent_job=self, + parent_export_job=self + ) + tar_job.start_job() + + except Exception as err: # pylint: disable=broad-except + logger.exception("job %s failed with error: %s", self.id, err) + tar_job.set_status("failed") + self.stop_job(reason="failed") + + else: + self.complete_job() + + +class AddBookToUserExportJob(ChildJob): + """append book metadata for each book in an export""" + + edition = ForeignKey(Edition, on_delete=CASCADE) + + def start_job(self): + """Start the job""" + try: + + book = {} + book["work"] = self.edition.parent_work.to_activity() + book["edition"] = self.edition.to_activity() + + if book["edition"].get("cover"): + # change the URL to be relative to the JSON file + filename = book["edition"]["cover"]["url"].rsplit("/", maxsplit=1)[-1] + book["edition"]["cover"]["url"] = f"covers/{filename}" + + # authors + book["authors"] = [] + for author in self.edition.authors.all(): + book["authors"].append(author.to_activity()) + + # Shelves this book is on + # Every ShelfItem is this book so we don't other serializing + book["shelves"] = [] + shelf_books = ( + ShelfBook.objects.select_related("shelf") + .filter(user=self.parent_job.user, book=self.edition) + .distinct() + ) + + for shelfbook in shelf_books: + book["shelves"].append(shelfbook.shelf.to_activity()) + + # Lists and ListItems + # ListItems include "notes" and "approved" so we need them + # even though we know it's this book + book["lists"] = [] + list_items = ListItem.objects.filter(book=self.edition, user=self.parent_job.user).distinct() + + for item in list_items: + list_info = item.book_list.to_activity() + list_info[ + "privacy" + ] = item.book_list.privacy # this isn't serialized so we add it + list_info["list_item"] = item.to_activity() + book["lists"].append(list_info) + + # Statuses + # Can't use select_subclasses here because + # we need to filter on the "book" value, + # which is not available on an ordinary Status + for status in ["comments", "quotations", "reviews"]: + book[status] = [] + + + comments = Comment.objects.filter(user=self.parent_job.user, book=self.edition).all() + for status in comments: + obj = status.to_activity() + obj["progress"] = status.progress + obj["progress_mode"] = status.progress_mode + book["comments"].append(obj) + + + quotes = Quotation.objects.filter(user=self.parent_job.user, book=self.edition).all() + for status in quotes: + obj = status.to_activity() + obj["position"] = status.position + obj["endposition"] = status.endposition + obj["position_mode"] = status.position_mode + book["quotations"].append(obj) + + + reviews = Review.objects.filter(user=self.parent_job.user, book=self.edition).all() + for status in reviews: + obj = status.to_activity() + book["reviews"].append(obj) + + # readthroughs can't be serialized to activity + book_readthroughs = ( + ReadThrough.objects.filter(user=self.parent_job.user, book=self.edition).distinct().values() + ) + book["readthroughs"] = list(book_readthroughs) + + self.parent_job.export_json["books"].append(book) + self.parent_job.save(update_fields=["export_json"]) + self.complete_job() + + except Exception as err: # pylint: disable=broad-except + logger.exception("AddBookToUserExportJob %s Failed with error: %s", self.id, err) + self.set_status("failed") + + +class AddFileToTar(ChildJob): + """add files to export""" + + parent_export_job = ForeignKey( + BookwyrmExportJob, on_delete=CASCADE, related_name="child_edition_export_jobs" + ) # TODO: do we actually need this? Does self.parent_job.export_data work? + + + def start_job(self): + """Start the job""" + + # NOTE we are doing this all in one big job, which has the potential to block a thread + # This is because we need to refer to the same s3_job or BookwyrmTarFile whilst writing + # Alternatives using a series of jobs in a loop would be beter + # but Hugh couldn't make that work + + try: + task_id=self.parent_export_job.task_id + export_data = self.parent_export_job.export_data + export_json = self.parent_export_job.export_json + json_data = DjangoJSONEncoder().encode(export_json) + user = self.parent_export_job.user + editions = get_books_for_user(user) + + if settings.USE_S3: + s3_job = S3Tar( + settings.AWS_STORAGE_BUCKET_NAME, + f"exports/{str(self.parent_export_job.task_id)}.tar.gz" + ) + + # TODO: either encrypt the file or we will need to get it to the user + # from this secure part of the bucket + export_data.save("archive.json", ContentFile(json_data.encode("utf-8"))) + + s3_job.add_file( + f"exports/{export_data.name}" + ) + s3_job.add_file( + f"images/{user.avatar.name}", + folder="avatar" + ) + for book in editions: + if getattr(book, "cover", False): + cover_name = f"images/{book.cover.name}" + s3_job.add_file( + cover_name, + folder="covers" + ) + + s3_job.tar() + # delete export json as soon as it's tarred + # there is probably a better way to do this + # Currently this merely makes the file empty + export_data.delete(save=False) + + else: + # TODO: is the export_data file open to the world? + logger.info( "export file URL: %s",export_data.url) + + export_data.open("wb") + with BookwyrmTarFile.open(mode="w:gz", fileobj=export_data) as tar: + + tar.write_bytes(json_data.encode("utf-8")) + + # Add avatar image if present + if getattr(user, "avatar", False): + tar.add_image(user.avatar, filename="avatar", directory=f"avatar/") # TODO: does this work? + + for book in editions: + if getattr(book, "cover", False): + tar.add_image(book.cover) + + export_data.close() + + + self.complete_job() + + except Exception as err: # pylint: disable=broad-except + logger.exception("AddFileToTar %s Failed with error: %s", self.id, err) + self.stop_job(reason="failed") + self.parent_job.stop_job(reason="failed") @app.task(queue=IMPORTS, base=ParentTask) def start_export_task(**kwargs): - """trigger the child tasks for each row""" + """trigger the child tasks for user export""" + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) # don't start the job if it was stopped from the UI if job.complete: return try: - # This is where ChildJobs get made + + # prepare the initial file and base json job.export_data = ContentFile(b"", str(uuid4())) - json_data = json_export(job.user) - tar_export(json_data, job.user, job.export_data) - job.save(update_fields=["export_data"]) + job.export_json = job.user.to_activity() + job.save(update_fields=["export_data", "export_json"]) + + # let's go + json_export.delay(job_id=job.id, job_user=job.user.id, no_children=False) + except Exception as err: # pylint: disable=broad-except logger.exception("User Export Job %s Failed with error: %s", job.id, err) job.set_status("failed") - job.set_status("complete") +@app.task(queue=IMPORTS, base=ParentTask) +def export_saved_lists_task(**kwargs): + """add user saved lists to export JSON""" + + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + saved_lists = List.objects.filter(id__in=job.user.saved_lists.all()).distinct() + job.export_json["saved_lists"] = [l.remote_id for l in saved_lists] + job.save(update_fields=["export_json"]) -def tar_export(json_data: str, user, file): - """wrap the export information in a tar file""" - file.open("wb") - with BookwyrmTarFile.open(mode="w:gz", fileobj=file) as tar: - tar.write_bytes(json_data.encode("utf-8")) +@app.task(queue=IMPORTS, base=ParentTask) +def export_follows_task(**kwargs): + """add user follows to export JSON""" - # Add avatar image if present - if getattr(user, "avatar", False): - tar.add_image(user.avatar, filename="avatar") - - editions = get_books_for_user(user) - for book in editions: - if getattr(book, "cover", False): - tar.add_image(book.cover) - - file.close() + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + follows = UserFollows.objects.filter(user_subject=job.user).distinct() + following = User.objects.filter(userfollows_user_object__in=follows).distinct() + job.export_json["follows"] = [f.remote_id for f in following] + job.save(update_fields=["export_json"]) -def json_export( - user, -): # pylint: disable=too-many-locals, too-many-statements, too-many-branches +@app.task(queue=IMPORTS, base=ParentTask) +def export_blocks_task(**kwargs): + """add user blocks to export JSON""" + + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + blocks = UserBlocks.objects.filter(user_subject=job.user).distinct() + blocking = User.objects.filter(userblocks_user_object__in=blocks).distinct() + job.export_json["blocks"] = [b.remote_id for b in blocking] + job.save(update_fields=["export_json"]) + + +@app.task(queue=IMPORTS, base=ParentTask) +def export_reading_goals_task(**kwargs): + """add user reading goals to export JSON""" + + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + reading_goals = AnnualGoal.objects.filter(user=job.user).distinct() + job.export_json["goals"] = [] + for goal in reading_goals: + exported_user["goals"].append( + {"goal": goal.goal, "year": goal.year, "privacy": goal.privacy} + ) + job.save(update_fields=["export_json"]) + + +@app.task(queue=IMPORTS, base=ParentTask) +def json_export(**kwargs): """Generate an export for a user""" - # User as AP object - exported_user = user.to_activity() + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + job.set_status("active") + job_id = kwargs["job_id"] + # I don't love this but it prevents a JSON encoding error # when there is no user image if isinstance( - exported_user["icon"], + job.export_json["icon"], dataclasses._MISSING_TYPE, # pylint: disable=protected-access ): - exported_user["icon"] = {} + job.export_json["icon"] = {} else: # change the URL to be relative to the JSON file - file_type = exported_user["icon"]["url"].rsplit(".", maxsplit=1)[-1] + file_type = job.export_json["icon"]["url"].rsplit(".", maxsplit=1)[-1] filename = f"avatar.{file_type}" - exported_user["icon"]["url"] = filename + job.export_json["icon"]["url"] = filename # Additional settings - can't be serialized as AP vals = [ @@ -98,120 +351,45 @@ def json_export( "default_post_privacy", "show_suggested_users", ] - exported_user["settings"] = {} + job.export_json["settings"] = {} for k in vals: - exported_user["settings"][k] = getattr(user, k) + job.export_json["settings"][k] = getattr(job.user, k) - # Reading goals - can't be serialized as AP - reading_goals = AnnualGoal.objects.filter(user=user).distinct() - exported_user["goals"] = [] - for goal in reading_goals: - exported_user["goals"].append( - {"goal": goal.goal, "year": goal.year, "privacy": goal.privacy} - ) + job.export_json["books"] = [] - # Reading history - can't be serialized as AP - readthroughs = ReadThrough.objects.filter(user=user).distinct().values() - readthroughs = list(readthroughs) + # save settings we just updated + job.save(update_fields=["export_json"]) - # Books - editions = get_books_for_user(user) - exported_user["books"] = [] + # trigger subtasks + export_saved_lists_task.delay(job_id=job_id, no_children=False) + export_follows_task.delay(job_id=job_id, no_children=False) + export_blocks_task.delay(job_id=job_id, no_children=False) + trigger_books_jobs.delay(job_id=job_id, no_children=False) - for edition in editions: - book = {} - book["work"] = edition.parent_work.to_activity() - book["edition"] = edition.to_activity() - if book["edition"].get("cover"): - # change the URL to be relative to the JSON file - filename = book["edition"]["cover"]["url"].rsplit("/", maxsplit=1)[-1] - book["edition"]["cover"]["url"] = f"covers/{filename}" +@app.task(queue=IMPORTS, base=ParentTask) +def trigger_books_jobs(**kwargs): + """trigger tasks to get data for each book""" - # authors - book["authors"] = [] - for author in edition.authors.all(): - book["authors"].append(author.to_activity()) + try: + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + editions = get_books_for_user(job.user) - # Shelves this book is on - # Every ShelfItem is this book so we don't other serializing - book["shelves"] = [] - shelf_books = ( - ShelfBook.objects.select_related("shelf") - .filter(user=user, book=edition) - .distinct() - ) + if len(editions) == 0: + job.notify_child_job_complete() + return - for shelfbook in shelf_books: - book["shelves"].append(shelfbook.shelf.to_activity()) - - # Lists and ListItems - # ListItems include "notes" and "approved" so we need them - # even though we know it's this book - book["lists"] = [] - list_items = ListItem.objects.filter(book=edition, user=user).distinct() - - for item in list_items: - list_info = item.book_list.to_activity() - list_info[ - "privacy" - ] = item.book_list.privacy # this isn't serialized so we add it - list_info["list_item"] = item.to_activity() - book["lists"].append(list_info) - - # Statuses - # Can't use select_subclasses here because - # we need to filter on the "book" value, - # which is not available on an ordinary Status - for status in ["comments", "quotations", "reviews"]: - book[status] = [] - - comments = Comment.objects.filter(user=user, book=edition).all() - for status in comments: - obj = status.to_activity() - obj["progress"] = status.progress - obj["progress_mode"] = status.progress_mode - book["comments"].append(obj) - - quotes = Quotation.objects.filter(user=user, book=edition).all() - for status in quotes: - obj = status.to_activity() - obj["position"] = status.position - obj["endposition"] = status.endposition - obj["position_mode"] = status.position_mode - book["quotations"].append(obj) - - reviews = Review.objects.filter(user=user, book=edition).all() - for status in reviews: - obj = status.to_activity() - book["reviews"].append(obj) - - # readthroughs can't be serialized to activity - book_readthroughs = ( - ReadThrough.objects.filter(user=user, book=edition).distinct().values() - ) - book["readthroughs"] = list(book_readthroughs) - - # append everything - exported_user["books"].append(book) - - # saved book lists - just the remote id - saved_lists = List.objects.filter(id__in=user.saved_lists.all()).distinct() - exported_user["saved_lists"] = [l.remote_id for l in saved_lists] - - # follows - just the remote id - follows = UserFollows.objects.filter(user_subject=user).distinct() - following = User.objects.filter(userfollows_user_object__in=follows).distinct() - exported_user["follows"] = [f.remote_id for f in following] - - # blocks - just the remote id - blocks = UserBlocks.objects.filter(user_subject=user).distinct() - blocking = User.objects.filter(userblocks_user_object__in=blocks).distinct() - - exported_user["blocks"] = [b.remote_id for b in blocking] - - return DjangoJSONEncoder().encode(exported_user) + for edition in editions: + try: + edition_job = AddBookToUserExportJob.objects.create(edition=edition, parent_job=job) + edition_job.start_job() + except Exception as err: # pylint: disable=broad-except + logger.exception("AddBookToUserExportJob %s Failed with error: %s", edition_job.id, err) + edition_job.set_status("failed") + except Exception as err: # pylint: disable=broad-except + logger.exception("trigger_books_jobs %s Failed with error: %s", job.id, err) + job.set_status("failed") def get_books_for_user(user): """Get all the books and editions related to a user""" diff --git a/bookwyrm/models/job.py b/bookwyrm/models/job.py index 4f5cb2093..5a2653571 100644 --- a/bookwyrm/models/job.py +++ b/bookwyrm/models/job.py @@ -135,8 +135,7 @@ class ParentJob(Job): ) app.control.revoke(list(tasks)) - for task in self.pending_child_jobs: - task.update(status=self.Status.STOPPED) + self.pending_child_jobs.update(status=self.Status.STOPPED) @property def has_completed(self): @@ -248,7 +247,7 @@ class SubTask(app.Task): """ def before_start( - self, task_id, args, kwargs + self, task_id, *args, **kwargs ): # pylint: disable=no-self-use, unused-argument """Handler called before the task starts. Override. @@ -272,7 +271,7 @@ class SubTask(app.Task): child_job.set_status(ChildJob.Status.ACTIVE) def on_success( - self, retval, task_id, args, kwargs + self, retval, task_id, *args, **kwargs ): # pylint: disable=no-self-use, unused-argument """Run by the worker if the task executes successfully. Override. diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index fcc91857a..7896850e3 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -442,3 +442,4 @@ if HTTP_X_FORWARDED_PROTO: # Do not change this setting unless you already have an existing # user with the same username - in which case you should change it! INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" +DATA_UPLOAD_MAX_MEMORY_SIZE = (1024**2 * 20) # 20MB TEMPORARY FIX WHILST WORKING ON THIS \ No newline at end of file diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py index 6dd9f522c..c97b4e848 100644 --- a/bookwyrm/storage_backends.py +++ b/bookwyrm/storage_backends.py @@ -1,6 +1,7 @@ """Handles backends for storages""" import os from tempfile import SpooledTemporaryFile +from django.core.files.storage import FileSystemStorage from storages.backends.s3boto3 import S3Boto3Storage from storages.backends.azure_storage import AzureStorage @@ -61,3 +62,16 @@ class AzureImagesStorage(AzureStorage): # pylint: disable=abstract-method location = "images" overwrite_files = False + +class ExportsFileStorage(FileSystemStorage): # pylint: disable=abstract-method + """Storage class for exports contents with local files""" + + location = "exports" + overwrite_files = False + +class ExportsS3Storage(S3Boto3Storage): # pylint: disable=abstract-method + """Storage class for exports contents with S3""" + + location = "exports" + default_acl = None + overwrite_files = False \ No newline at end of file diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index fca66688a..754db41dd 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -9,7 +9,7 @@ from django.utils.translation import gettext_lazy as _ from django.templatetags.static import static from bookwyrm.models import User -from bookwyrm.settings import INSTANCE_ACTOR_USERNAME +from bookwyrm.settings import INSTANCE_ACTOR_USERNAME, USE_S3 register = template.Library() @@ -133,15 +133,22 @@ def get_file_size(file): """display the size of a file in human readable terms""" try: - raw_size = os.stat(file.path).st_size - if raw_size < 1024: - return f"{raw_size} bytes" - if raw_size < 1024**2: - return f"{raw_size/1024:.2f} KB" - if raw_size < 1024**3: - return f"{raw_size/1024**2:.2f} MB" - return f"{raw_size/1024**3:.2f} GB" - except Exception: # pylint: disable=broad-except + # TODO: this obviously isn't a proper solution + # boto storages do not implement 'path' + if not USE_S3: + raw_size = os.stat(file.path).st_size + if raw_size < 1024: + return f"{raw_size} bytes" + if raw_size < 1024**2: + return f"{raw_size/1024:.2f} KB" + if raw_size < 1024**3: + return f"{raw_size/1024**2:.2f} MB" + return f"{raw_size/1024**3:.2f} GB" + + return "" + + except Exception as e: # pylint: disable=broad-except + print(e) return "" diff --git a/exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 b/exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 new file mode 100644 index 0000000000000000000000000000000000000000..d7166b70306179d10b652499641665bc4e5a992a GIT binary patch literal 3820 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 literal 0 HcmV?d00001 diff --git a/exports/ba15a57f-e29e-4a29-aaf4-306b66960273 b/exports/ba15a57f-e29e-4a29-aaf4-306b66960273 new file mode 100644 index 0000000000000000000000000000000000000000..318069303d9f47f3296429b66dc293422a67d8fe GIT binary patch literal 41614 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 Date: Sun, 14 Jan 2024 12:19:59 +1100 Subject: [PATCH 027/200] oops - remove test export files - check in emblackened files --- .../migrations/0192_auto_20240114_0055.py | 77 ++++++++++++----- bookwyrm/models/bookwyrm_export_job.py | 79 ++++++++++-------- bookwyrm/settings.py | 4 +- bookwyrm/storage_backends.py | 4 +- exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 | Bin 3820 -> 0 bytes exports/ba15a57f-e29e-4a29-aaf4-306b66960273 | Bin 41614 -> 0 bytes 6 files changed, 108 insertions(+), 56 deletions(-) delete mode 100644 exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 delete mode 100644 exports/ba15a57f-e29e-4a29-aaf4-306b66960273 diff --git a/bookwyrm/migrations/0192_auto_20240114_0055.py b/bookwyrm/migrations/0192_auto_20240114_0055.py index f4d324f7f..824439728 100644 --- a/bookwyrm/migrations/0192_auto_20240114_0055.py +++ b/bookwyrm/migrations/0192_auto_20240114_0055.py @@ -9,45 +9,84 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0191_merge_20240102_0326'), + ("bookwyrm", "0191_merge_20240102_0326"), ] operations = [ migrations.AddField( - model_name='bookwyrmexportjob', - name='export_json', - field=models.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder, null=True), + model_name="bookwyrmexportjob", + name="export_json", + field=models.JSONField( + encoder=django.core.serializers.json.DjangoJSONEncoder, null=True + ), ), migrations.AddField( - model_name='bookwyrmexportjob', - name='json_completed', + model_name="bookwyrmexportjob", + name="json_completed", field=models.BooleanField(default=False), ), migrations.AlterField( - model_name='bookwyrmexportjob', - name='export_data', - field=models.FileField(null=True, storage=bookwyrm.storage_backends.ExportsFileStorage, upload_to=''), + model_name="bookwyrmexportjob", + name="export_data", + field=models.FileField( + null=True, + storage=bookwyrm.storage_backends.ExportsFileStorage, + upload_to="", + ), ), migrations.CreateModel( - name='AddFileToTar', + name="AddFileToTar", fields=[ - ('childjob_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.childjob')), - ('parent_export_job', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='child_edition_export_jobs', to='bookwyrm.bookwyrmexportjob')), + ( + "childjob_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="bookwyrm.childjob", + ), + ), + ( + "parent_export_job", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="child_edition_export_jobs", + to="bookwyrm.bookwyrmexportjob", + ), + ), ], options={ - 'abstract': False, + "abstract": False, }, - bases=('bookwyrm.childjob',), + bases=("bookwyrm.childjob",), ), migrations.CreateModel( - name='AddBookToUserExportJob', + name="AddBookToUserExportJob", fields=[ - ('childjob_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.childjob')), - ('edition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.edition')), + ( + "childjob_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="bookwyrm.childjob", + ), + ), + ( + "edition", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="bookwyrm.edition", + ), + ), ], options={ - 'abstract': False, + "abstract": False, }, - bases=('bookwyrm.childjob',), + bases=("bookwyrm.childjob",), ), ] diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 12a9792e2..2d1c0d94f 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -24,6 +24,7 @@ from bookwyrm.utils.tar import BookwyrmTarFile logger = logging.getLogger(__name__) + class BookwyrmExportJob(ParentJob): """entry for a specific request to export a bookwyrm user""" @@ -32,11 +33,12 @@ class BookwyrmExportJob(ParentJob): else: storage = storage_backends.ExportsFileStorage - export_data = FileField(null=True, storage=storage) # use custom storage backend here + export_data = FileField( + null=True, storage=storage + ) # use custom storage backend here export_json = JSONField(null=True, encoder=DjangoJSONEncoder) json_completed = BooleanField(default=False) - def start_job(self): """Start the job""" @@ -44,7 +46,6 @@ class BookwyrmExportJob(ParentJob): self.task_id = task.id self.save(update_fields=["task_id"]) - def notify_child_job_complete(self): """let the job know when the items get work done""" @@ -63,9 +64,8 @@ class BookwyrmExportJob(ParentJob): # add json file to tarfile tar_job = AddFileToTar.objects.create( - parent_job=self, - parent_export_job=self - ) + parent_job=self, parent_export_job=self + ) tar_job.start_job() except Exception as err: # pylint: disable=broad-except @@ -116,7 +116,9 @@ class AddBookToUserExportJob(ChildJob): # ListItems include "notes" and "approved" so we need them # even though we know it's this book book["lists"] = [] - list_items = ListItem.objects.filter(book=self.edition, user=self.parent_job.user).distinct() + list_items = ListItem.objects.filter( + book=self.edition, user=self.parent_job.user + ).distinct() for item in list_items: list_info = item.book_list.to_activity() @@ -133,16 +135,18 @@ class AddBookToUserExportJob(ChildJob): for status in ["comments", "quotations", "reviews"]: book[status] = [] - - comments = Comment.objects.filter(user=self.parent_job.user, book=self.edition).all() + comments = Comment.objects.filter( + user=self.parent_job.user, book=self.edition + ).all() for status in comments: obj = status.to_activity() obj["progress"] = status.progress obj["progress_mode"] = status.progress_mode book["comments"].append(obj) - - quotes = Quotation.objects.filter(user=self.parent_job.user, book=self.edition).all() + quotes = Quotation.objects.filter( + user=self.parent_job.user, book=self.edition + ).all() for status in quotes: obj = status.to_activity() obj["position"] = status.position @@ -150,15 +154,18 @@ class AddBookToUserExportJob(ChildJob): obj["position_mode"] = status.position_mode book["quotations"].append(obj) - - reviews = Review.objects.filter(user=self.parent_job.user, book=self.edition).all() + reviews = Review.objects.filter( + user=self.parent_job.user, book=self.edition + ).all() for status in reviews: obj = status.to_activity() book["reviews"].append(obj) # readthroughs can't be serialized to activity book_readthroughs = ( - ReadThrough.objects.filter(user=self.parent_job.user, book=self.edition).distinct().values() + ReadThrough.objects.filter(user=self.parent_job.user, book=self.edition) + .distinct() + .values() ) book["readthroughs"] = list(book_readthroughs) @@ -167,7 +174,9 @@ class AddBookToUserExportJob(ChildJob): self.complete_job() except Exception as err: # pylint: disable=broad-except - logger.exception("AddBookToUserExportJob %s Failed with error: %s", self.id, err) + logger.exception( + "AddBookToUserExportJob %s Failed with error: %s", self.id, err + ) self.set_status("failed") @@ -176,8 +185,7 @@ class AddFileToTar(ChildJob): parent_export_job = ForeignKey( BookwyrmExportJob, on_delete=CASCADE, related_name="child_edition_export_jobs" - ) # TODO: do we actually need this? Does self.parent_job.export_data work? - + ) # TODO: do we actually need this? Does self.parent_job.export_data work? def start_job(self): """Start the job""" @@ -188,7 +196,7 @@ class AddFileToTar(ChildJob): # but Hugh couldn't make that work try: - task_id=self.parent_export_job.task_id + task_id = self.parent_export_job.task_id export_data = self.parent_export_job.export_data export_json = self.parent_export_job.export_json json_data = DjangoJSONEncoder().encode(export_json) @@ -198,27 +206,19 @@ class AddFileToTar(ChildJob): if settings.USE_S3: s3_job = S3Tar( settings.AWS_STORAGE_BUCKET_NAME, - f"exports/{str(self.parent_export_job.task_id)}.tar.gz" + f"exports/{str(self.parent_export_job.task_id)}.tar.gz", ) # TODO: either encrypt the file or we will need to get it to the user # from this secure part of the bucket export_data.save("archive.json", ContentFile(json_data.encode("utf-8"))) - s3_job.add_file( - f"exports/{export_data.name}" - ) - s3_job.add_file( - f"images/{user.avatar.name}", - folder="avatar" - ) + s3_job.add_file(f"exports/{export_data.name}") + s3_job.add_file(f"images/{user.avatar.name}", folder="avatar") for book in editions: if getattr(book, "cover", False): cover_name = f"images/{book.cover.name}" - s3_job.add_file( - cover_name, - folder="covers" - ) + s3_job.add_file(cover_name, folder="covers") s3_job.tar() # delete export json as soon as it's tarred @@ -228,7 +228,7 @@ class AddFileToTar(ChildJob): else: # TODO: is the export_data file open to the world? - logger.info( "export file URL: %s",export_data.url) + logger.info("export file URL: %s", export_data.url) export_data.open("wb") with BookwyrmTarFile.open(mode="w:gz", fileobj=export_data) as tar: @@ -237,7 +237,9 @@ class AddFileToTar(ChildJob): # Add avatar image if present if getattr(user, "avatar", False): - tar.add_image(user.avatar, filename="avatar", directory=f"avatar/") # TODO: does this work? + tar.add_image( + user.avatar, filename="avatar", directory=f"avatar/" + ) # TODO: does this work? for book in editions: if getattr(book, "cover", False): @@ -245,7 +247,6 @@ class AddFileToTar(ChildJob): export_data.close() - self.complete_job() except Exception as err: # pylint: disable=broad-except @@ -277,6 +278,7 @@ def start_export_task(**kwargs): logger.exception("User Export Job %s Failed with error: %s", job.id, err) job.set_status("failed") + @app.task(queue=IMPORTS, base=ParentTask) def export_saved_lists_task(**kwargs): """add user saved lists to export JSON""" @@ -381,16 +383,23 @@ def trigger_books_jobs(**kwargs): for edition in editions: try: - edition_job = AddBookToUserExportJob.objects.create(edition=edition, parent_job=job) + edition_job = AddBookToUserExportJob.objects.create( + edition=edition, parent_job=job + ) edition_job.start_job() except Exception as err: # pylint: disable=broad-except - logger.exception("AddBookToUserExportJob %s Failed with error: %s", edition_job.id, err) + logger.exception( + "AddBookToUserExportJob %s Failed with error: %s", + edition_job.id, + err, + ) edition_job.set_status("failed") except Exception as err: # pylint: disable=broad-except logger.exception("trigger_books_jobs %s Failed with error: %s", job.id, err) job.set_status("failed") + def get_books_for_user(user): """Get all the books and editions related to a user""" diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 7896850e3..7c8947521 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -442,4 +442,6 @@ if HTTP_X_FORWARDED_PROTO: # Do not change this setting unless you already have an existing # user with the same username - in which case you should change it! INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" -DATA_UPLOAD_MAX_MEMORY_SIZE = (1024**2 * 20) # 20MB TEMPORARY FIX WHILST WORKING ON THIS \ No newline at end of file +DATA_UPLOAD_MAX_MEMORY_SIZE = ( + 1024**2 * 20 +) # 20MB TEMPORARY FIX WHILST WORKING ON THIS diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py index c97b4e848..87c29ae70 100644 --- a/bookwyrm/storage_backends.py +++ b/bookwyrm/storage_backends.py @@ -63,15 +63,17 @@ class AzureImagesStorage(AzureStorage): # pylint: disable=abstract-method location = "images" overwrite_files = False + class ExportsFileStorage(FileSystemStorage): # pylint: disable=abstract-method """Storage class for exports contents with local files""" location = "exports" overwrite_files = False + class ExportsS3Storage(S3Boto3Storage): # pylint: disable=abstract-method """Storage class for exports contents with S3""" location = "exports" default_acl = None - overwrite_files = False \ No newline at end of file + overwrite_files = False diff --git a/exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 b/exports/6ee95f7f-58cd-4bff-9d41-1ac2b3db6187 deleted file mode 100644 index d7166b70306179d10b652499641665bc4e5a992a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3820 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 diff --git a/exports/ba15a57f-e29e-4a29-aaf4-306b66960273 b/exports/ba15a57f-e29e-4a29-aaf4-306b66960273 deleted file mode 100644 index 318069303d9f47f3296429b66dc293422a67d8fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41614 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 Date: Sun, 14 Jan 2024 14:14:20 +1100 Subject: [PATCH 028/200] ignore exports dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ec2a08f80..6193f10c3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ # BookWyrm .env /images/ +/exports/ bookwyrm/static/css/bookwyrm.css bookwyrm/static/css/themes/ !bookwyrm/static/css/themes/bookwyrm-*.scss From 5ef104b802dce740835f4a34bb4403459e2791bc Mon Sep 17 00:00:00 2001 From: Rohan Sureshkumar Date: Mon, 15 Jan 2024 17:22:33 +0530 Subject: [PATCH 029/200] Issue-3187: addressing review comments --- bookwyrm/templates/feed/feed.html | 4 ++-- bookwyrm/views/feed.py | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html index 820314b7a..56c380202 100644 --- a/bookwyrm/templates/feed/feed.html +++ b/bookwyrm/templates/feed/feed.html @@ -33,7 +33,7 @@ - {% if request.user.show_goal and not goal and tab.key == 'home' and has_read_throughs %} + {% if request.user.show_goal and not goal and tab.key == 'home' %} {% now 'Y' as year %}
    {% include 'feed/goal_card.html' with year=year %} @@ -41,7 +41,7 @@
    {% endif %} - {% if annual_summary_year and tab.key == 'home' %} + {% if annual_summary_year and tab.key == 'home' and has_read_throughs %} {% endif %} - {% if annual_summary_year and tab.key == 'home' and has_read_throughs %} + {% if annual_summary_year and tab.key == 'home' and has_summary_read_throughs %}
    • -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 17218b93e..2d91990d0 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -197,6 +197,8 @@ class Status(View): "status": status, "children": children, "ancestors": ancestors, + "title": status.page_title, + "description": status.page_description, "preview": preview, }, } From ad56024ffe8adac7a8cab916b160b2f18edd2f1d Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 20 Jan 2024 17:18:50 +0100 Subject: [PATCH 037/200] Add Status.page_image property --- bookwyrm/models/status.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 04fb8daa3..236826a2b 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -190,6 +190,15 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): """description of the page in meta tags when only this status is shown""" return None + @property + def page_image(self): + """image to use as preview in meta tags when only this status is shown""" + if self.mention_books.exists(): + book = self.mention_books.first() + return book.preview_image + else: + return self.user.preview_image + def to_replies(self, **kwargs): """helper function for loading AP serialized replies to a status""" return self.to_ordered_collection( @@ -313,6 +322,10 @@ class BookStatus(Status): abstract = True + @property + def page_image(self): + return self.book.preview_image or super().page_image + class Comment(BookStatus): """like a review but without a rating and transient""" From 290ee997b3c935297811f033d8da0a564ba48f52 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 20 Jan 2024 17:24:20 +0100 Subject: [PATCH 038/200] Refactor OpenGraph tags logic --- bookwyrm/templates/snippets/opengraph.html | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/bookwyrm/templates/snippets/opengraph.html b/bookwyrm/templates/snippets/opengraph.html index 1e87a464f..78a6b1b3f 100644 --- a/bookwyrm/templates/snippets/opengraph.html +++ b/bookwyrm/templates/snippets/opengraph.html @@ -1,24 +1,25 @@ {% load static %} -{% if preview_images_enabled is True %} +{% firstof image site.preview_image as page_image %} +{% if page_image %} - {% if image %} - - - {% else %} - - - {% endif %} + + +{% elif site.logo %} + + + + {% else %} - - + + + {% endif %} - - - - +{% firstof description site.instance_tagline as description %} + + From ea9d3f8ba1ac3db3a050b0355bd3de3d20cd061e Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 20 Jan 2024 17:25:20 +0100 Subject: [PATCH 039/200] Use Status.page_image for OpenGraph tags --- bookwyrm/templates/feed/status.html | 4 ++-- bookwyrm/views/feed.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html index b381c3714..64e992a01 100644 --- a/bookwyrm/templates/feed/status.html +++ b/bookwyrm/templates/feed/status.html @@ -6,7 +6,7 @@ {% block opengraph %} - {% include 'snippets/opengraph.html' with image=preview %} + {% include 'snippets/opengraph.html' with image=page_image %} {% endblock %} @@ -39,4 +39,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 2d91990d0..d1feb278e 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -185,12 +185,6 @@ class Status(View): params=[status.id, visible_thread, visible_thread], ) - preview = None - if hasattr(status, "book"): - preview = status.book.preview_image - elif status.mention_books.exists(): - preview = status.mention_books.first().preview_image - data = { **feed_page_data(request.user), **{ @@ -199,7 +193,7 @@ class Status(View): "ancestors": ancestors, "title": status.page_title, "description": status.page_description, - "preview": preview, + "page_image": status.page_image, }, } return TemplateResponse(request, "feed/status.html", data) From 646b27b7a7e1099e81d5c3fa4c2b0008f54c889e Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 20 Jan 2024 17:28:51 +0100 Subject: [PATCH 040/200] OpenGraph: fall back on book cover when preview images are disabled --- bookwyrm/models/status.py | 4 ++-- bookwyrm/templates/book/book.html | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 236826a2b..94893d6ae 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -195,7 +195,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): """image to use as preview in meta tags when only this status is shown""" if self.mention_books.exists(): book = self.mention_books.first() - return book.preview_image + return book.preview_image or book.cover else: return self.user.preview_image @@ -324,7 +324,7 @@ class BookStatus(Status): @property def page_image(self): - return self.book.preview_image or super().page_image + return self.book.preview_image or self.book.cover or super().page_image class Comment(BookStatus): diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 8e76fb014..4c345832e 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -9,7 +9,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph %} - {% include 'snippets/opengraph.html' with title=book.title description=book|book_description image=book.preview_image %} + {% firstof book.preview_image book.cover as book_image %} + {% include 'snippets/opengraph.html' with title=book.title description=book|book_description image=book_image %} {% endblock %} {% block content %} From eb6bea013fd1634f178da689e4843adcd05a6296 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 21 Jan 2024 11:04:08 +0100 Subject: [PATCH 041/200] Fix pylint warning --- bookwyrm/models/status.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 94893d6ae..0c9b18cc9 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -196,8 +196,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): if self.mention_books.exists(): book = self.mention_books.first() return book.preview_image or book.cover - else: - return self.user.preview_image + return self.user.preview_image def to_replies(self, **kwargs): """helper function for loading AP serialized replies to a status""" From c4596544a341a5030fe02fe7b1df704f343a35ee Mon Sep 17 00:00:00 2001 From: Rohan Sureshkumar Date: Wed, 24 Jan 2024 19:18:46 +0530 Subject: [PATCH 042/200] Issue-3187: fix failing tests --- bookwyrm/views/feed.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 79e2f24d2..6e8f820e4 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -52,9 +52,18 @@ class Feed(View): paginated = Paginator(filtered_activities, PAGE_LENGTH) suggestions = suggested_users.get_suggestions(request.user) - cutoff = date(get_annual_summary_year(), 12, 31) - readthroughs = models.ReadThrough.objects.filter( - user=request.user, finish_date__lte=cutoff + + cutoff = ( + date(get_annual_summary_year(), 12, 31) + if get_annual_summary_year() + else None + ) + readthroughs = ( + models.ReadThrough.objects.filter( + user=request.user, finish_date__lte=cutoff + ) + if get_annual_summary_year() + else [] ) data = { From 2d4b11aaeedd9530ad4ddcfcea6f8aeb2b55dda9 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Thu, 25 Jan 2024 01:50:10 +0300 Subject: [PATCH 043/200] Adding FictionBook format ("FB2", "FB3") to autocomplete options in "Get a copy" block. --- bookwyrm/static/js/autocomplete.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bookwyrm/static/js/autocomplete.js b/bookwyrm/static/js/autocomplete.js index a98cd9634..6836d356d 100644 --- a/bookwyrm/static/js/autocomplete.js +++ b/bookwyrm/static/js/autocomplete.js @@ -111,6 +111,10 @@ const tries = { }, }, f: { + b: { + 2: "FB2", + 3: "FB3", + }, l: { a: { c: "FLAC", From 82f9aa9da4ae68c2e042bbb981c89d8089cd39dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Wed, 24 Jan 2024 19:30:45 +0100 Subject: [PATCH 044/200] Set SESSION_COOKIE_AGE from environment, default to one month While we do wish for a longer maximum age (up to one year, see #3082), we only want to do that after termination of active sessions is implemented (see #2278). In the meantime, by reading and setting the variable from settings, we allow site admins to alter the default. --- bookwyrm/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 16241f9df..4af7afb14 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -30,6 +30,9 @@ RELEASE_API = env( PAGE_LENGTH = env.int("PAGE_LENGTH", 15) DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English") +# TODO: extend maximum age to 1 year once termination of active sessions +# is implemented (see bookwyrm-social#2278, bookwyrm-social#3082). +SESSION_COOKIE_AGE = env.int("SESSION_COOKIE_AGE", 3600 * 24 * 30) # 1 month JS_CACHE = "ac315a3b" From 80ad36e75b20213939852470506f12593353216c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Wed, 24 Jan 2024 19:54:55 +0100 Subject: [PATCH 045/200] Include SESSION_COOKIE_AGE in .env.example Suggested-by: Alexey Skobkin --- .env.example | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 20ce8240b..d0971660e 100644 --- a/.env.example +++ b/.env.example @@ -137,6 +137,10 @@ TWO_FACTOR_LOGIN_MAX_SECONDS=60 # and AWS_S3_CUSTOM_DOMAIN (if used) are added by default. # Value should be a comma-separated list of host names. CSP_ADDITIONAL_HOSTS= + # The last number here means "megabytes" # Increase if users are having trouble uploading BookWyrm export files. -DATA_UPLOAD_MAX_MEMORY_SIZE = (1024**2 * 100) \ No newline at end of file +DATA_UPLOAD_MAX_MEMORY_SIZE = (1024**2 * 100) + +# Time before being logged out (in seconds) +# SESSION_COOKIE_AGE=2592000 # current default: 30 days From 31babdfa510d88f89d08cbfb56de94cd8c0ac028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Fri, 26 Jan 2024 06:01:34 -0300 Subject: [PATCH 046/200] Always prefer shared inboxes when computing receipent lists This avoids duplicate submissions to remote instances when mentioning followers (i.e., `POST /user/foo/inbox` followed by `POST /inbox`, which results in two separate `add_status` tasks, and might generate duplicates in the target instance). --- bookwyrm/models/activitypub_mixin.py | 2 +- bookwyrm/tests/models/test_activitypub_mixin.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index d0a941f43..41772a162 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -153,7 +153,7 @@ class ActivitypubMixin: mentions = self.recipients if hasattr(self, "recipients") else [] # we always send activities to explicitly mentioned users' inboxes - recipients = [u.inbox for u in mentions or [] if not u.local] + recipients = [u.shared_inbox or u.inbox for u in mentions if not u.local] # unless it's a dm, all the followers should receive the activity if privacy != "direct": diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index cad970412..2f6fad76d 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -227,14 +227,18 @@ class ActivitypubMixins(TestCase): shared_inbox="http://example.com/inbox", outbox="https://example.com/users/nutria/outbox", ) - MockSelf = namedtuple("Self", ("privacy", "user")) - mock_self = MockSelf("public", self.local_user) + MockSelf = namedtuple("Self", ("privacy", "user", "recipients")) self.local_user.followers.add(self.remote_user) self.local_user.followers.add(another_remote_user) + mock_self = MockSelf("public", self.local_user, []) recipients = ActivitypubMixin.get_recipients(mock_self) - self.assertEqual(len(recipients), 1) - self.assertEqual(recipients[0], "http://example.com/inbox") + self.assertCountEqual(recipients, ["http://example.com/inbox"]) + + # should also work with recipient that is a follower + mock_self.recipients.append(another_remote_user) + recipients = ActivitypubMixin.get_recipients(mock_self) + self.assertCountEqual(recipients, ["http://example.com/inbox"]) def test_get_recipients_software(self, *_): """should differentiate between bookwyrm and other remote users""" From 8ac873419fe66de65cdddf6a25560ed24c4e4a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Fri, 26 Jan 2024 06:29:59 -0300 Subject: [PATCH 047/200] refactor: eagerly use a set in recipients, get_recipients --- bookwyrm/models/activitypub_mixin.py | 25 +++++++++++++------------ bookwyrm/models/status.py | 6 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index 41772a162..db737b8bc 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -152,8 +152,9 @@ class ActivitypubMixin: # find anyone who's tagged in a status, for example mentions = self.recipients if hasattr(self, "recipients") else [] - # we always send activities to explicitly mentioned users' inboxes - recipients = [u.shared_inbox or u.inbox for u in mentions if not u.local] + # we always send activities to explicitly mentioned users (using shared inboxes + # where available to avoid duplicate submissions to a given instance) + recipients = {u.shared_inbox or u.inbox for u in mentions if not u.local} # unless it's a dm, all the followers should receive the activity if privacy != "direct": @@ -173,18 +174,18 @@ class ActivitypubMixin: if user: queryset = queryset.filter(following=user) - # ideally, we will send to shared inboxes for efficiency - shared_inboxes = ( - queryset.filter(shared_inbox__isnull=False) - .values_list("shared_inbox", flat=True) - .distinct() + # as above, we prefer shared inboxes if available + recipients.update( + queryset.filter(shared_inbox__isnull=False).values_list( + "shared_inbox", flat=True + ) ) - # but not everyone has a shared inbox - inboxes = queryset.filter(shared_inbox__isnull=True).values_list( - "inbox", flat=True + recipients.update( + queryset.filter(shared_inbox__isnull=True).values_list( + "inbox", flat=True + ) ) - recipients += list(shared_inboxes) + list(inboxes) - return list(set(recipients)) + return list(recipients) def to_activity_dataclass(self): """convert from a model to an activity""" diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index cc44fe2bf..0d1d0d839 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -107,14 +107,14 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): @property def recipients(self): """tagged users who definitely need to get this status in broadcast""" - mentions = [u for u in self.mention_users.all() if not u.local] + mentions = {u for u in self.mention_users.all() if not u.local} if ( hasattr(self, "reply_parent") and self.reply_parent and not self.reply_parent.user.local ): - mentions.append(self.reply_parent.user) - return list(set(mentions)) + mentions.add(self.reply_parent.user) + return list(mentions) @classmethod def ignore_activity( From accb3273f1f1a2f2465aee39ba9b3ddeecb5e4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Fri, 26 Jan 2024 06:42:25 -0300 Subject: [PATCH 048/200] When determining privacy, check for unlisted early If `followers_url` is found in `to`, the post may still be _unlisted_ if `"https://www.w3.org/ns/activitystreams#Public"` appears in `cc`. Hence this should be checked earlier. --- bookwyrm/models/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 4bd580705..107f4055a 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -260,12 +260,12 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField): if to == [self.public]: setattr(instance, self.name, "public") + elif self.public in cc: + setattr(instance, self.name, "unlisted") elif to == [user.followers_url]: setattr(instance, self.name, "followers") elif cc == []: setattr(instance, self.name, "direct") - elif self.public in cc: - setattr(instance, self.name, "unlisted") else: setattr(instance, self.name, "followers") return original == getattr(instance, self.name) From 940274b1c22e08fc870e92cc95e5ae6a95f5297e Mon Sep 17 00:00:00 2001 From: Braden Solt Date: Fri, 26 Jan 2024 15:47:55 -0700 Subject: [PATCH 049/200] classes that fix widths --- bookwyrm/templates/confirm_email/confirm_email.html | 4 ++-- bookwyrm/templates/landing/invite.html | 4 ++-- bookwyrm/templates/landing/login.html | 12 +++++++----- bookwyrm/templates/landing/password_reset.html | 4 ++-- bookwyrm/templates/landing/reactivate.html | 12 +++++++----- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/bookwyrm/templates/confirm_email/confirm_email.html b/bookwyrm/templates/confirm_email/confirm_email.html index abdd3a734..49a1ebd2d 100644 --- a/bookwyrm/templates/confirm_email/confirm_email.html +++ b/bookwyrm/templates/confirm_email/confirm_email.html @@ -6,8 +6,8 @@ {% block content %}

    {% trans "Confirm your email address" %}

    -
    -
    +
    +

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

    diff --git a/bookwyrm/templates/landing/invite.html b/bookwyrm/templates/landing/invite.html index d56cad38c..3e3ddab85 100644 --- a/bookwyrm/templates/landing/invite.html +++ b/bookwyrm/templates/landing/invite.html @@ -6,8 +6,8 @@ {% block content %}

    {% trans "Create an Account" %}

    -
    -
    +
    +
    {% if valid %}
    diff --git a/bookwyrm/templates/landing/login.html b/bookwyrm/templates/landing/login.html index 369a72bd2..8ea828b74 100644 --- a/bookwyrm/templates/landing/login.html +++ b/bookwyrm/templates/landing/login.html @@ -6,7 +6,7 @@ {% block content %}

    {% trans "Log in" %}

    -
    +
    {% if login_form.non_field_errors %}

    {{ login_form.non_field_errors }}

    {% endif %} @@ -20,13 +20,15 @@
    - +
    - +
    {% include 'snippets/form_errors.html' with errors_list=login_form.password.errors id="desc_password" %} @@ -58,10 +60,10 @@ {% include 'snippets/about.html' %}

    - {% trans "More about this site" %} + {% trans "More about this site" %}

    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/bookwyrm/templates/landing/password_reset.html b/bookwyrm/templates/landing/password_reset.html index 786eaa0ab..2f41c5505 100644 --- a/bookwyrm/templates/landing/password_reset.html +++ b/bookwyrm/templates/landing/password_reset.html @@ -4,8 +4,8 @@ {% block title %}{% trans "Reset Password" %}{% endblock %} {% block content %} -
    -
    +
    +

    {% trans "Reset Password" %}

    diff --git a/bookwyrm/templates/landing/reactivate.html b/bookwyrm/templates/landing/reactivate.html index da9e0b050..adb41238f 100644 --- a/bookwyrm/templates/landing/reactivate.html +++ b/bookwyrm/templates/landing/reactivate.html @@ -6,7 +6,7 @@ {% block content %}

    {% trans "Reactivate Account" %}

    -
    +
    {% if login_form.non_field_errors %}

    {{ login_form.non_field_errors }}

    {% endif %} @@ -16,13 +16,15 @@
    - +
    - +
    {% include 'snippets/form_errors.html' with errors_list=login_form.password.errors id="desc_password" %} @@ -51,10 +53,10 @@ {% include 'snippets/about.html' %}

    - {% trans "More about this site" %} + {% trans "More about this site" %}

    -{% endblock %} +{% endblock %} \ No newline at end of file From 629acbaa193fa2b4a22593fd31a2e31f3bb8c3ff Mon Sep 17 00:00:00 2001 From: Braden Solt Date: Sat, 27 Jan 2024 10:58:57 -0700 Subject: [PATCH 050/200] add series number on posts in the feed --- bookwyrm/templates/snippets/book_titleby.html | 9 ++++++++- bookwyrm/templates/snippets/status/headers/comment.html | 4 ++++ .../templates/snippets/status/headers/quotation.html | 4 ++++ bookwyrm/templates/snippets/status/headers/read.html | 4 ++++ bookwyrm/templates/snippets/status/headers/reading.html | 4 ++++ bookwyrm/templates/snippets/status/headers/review.html | 4 ++++ .../snippets/status/headers/stopped_reading.html | 4 ++++ bookwyrm/templates/snippets/status/headers/to_read.html | 5 +++++ 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html index dc42bf273..35e0c4c45 100644 --- a/bookwyrm/templates/snippets/book_titleby.html +++ b/bookwyrm/templates/snippets/book_titleby.html @@ -9,12 +9,19 @@ {% if book.authors.exists %} {% blocktrans trimmed with path=book.local_path title=book|book_title %} -{{ title }} by +{{ title }} + +by {% endblocktrans %} {% include 'snippets/authors.html' with book=book limit=3 %} {% else %} {{ book|book_title }} {% endif %} +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} + + {% endcache %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/comment.html b/bookwyrm/templates/snippets/status/headers/comment.html index e3e2ec40b..b78175bb0 100644 --- a/bookwyrm/templates/snippets/status/headers/comment.html +++ b/bookwyrm/templates/snippets/status/headers/comment.html @@ -16,5 +16,9 @@ commented on {{ book }} by {{ book }} {% endblocktrans %} +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} + {% endif %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/quotation.html b/bookwyrm/templates/snippets/status/headers/quotation.html index 2cdd5a991..8a6776303 100644 --- a/bookwyrm/templates/snippets/status/headers/quotation.html +++ b/bookwyrm/templates/snippets/status/headers/quotation.html @@ -16,5 +16,9 @@ quoted {{ book }} by { quoted {{ book }} {% endblocktrans %} +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} + {% endif %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/read.html b/bookwyrm/templates/snippets/status/headers/read.html index a59a3544e..aaebbd267 100644 --- a/bookwyrm/templates/snippets/status/headers/read.html +++ b/bookwyrm/templates/snippets/status/headers/read.html @@ -18,5 +18,9 @@ finished reading {{ book }} by {{ book }} {% endblocktrans %} +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} + {% endif %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/reading.html b/bookwyrm/templates/snippets/status/headers/reading.html index 886158f29..f773775e0 100644 --- a/bookwyrm/templates/snippets/status/headers/reading.html +++ b/bookwyrm/templates/snippets/status/headers/reading.html @@ -12,6 +12,10 @@ started reading {{ book }} by {{ book }} by {{ book }} {% endblocktrans %} +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} + {% endif %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/stopped_reading.html b/bookwyrm/templates/snippets/status/headers/stopped_reading.html index 3b6a314e1..d3891cb78 100644 --- a/bookwyrm/templates/snippets/status/headers/stopped_reading.html +++ b/bookwyrm/templates/snippets/status/headers/stopped_reading.html @@ -18,6 +18,10 @@ stopped reading {{ book }} by {{ book }} {% endblocktrans %} +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} + {% endif %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/to_read.html b/bookwyrm/templates/snippets/status/headers/to_read.html index 2abdde17b..4d1b2ab1b 100644 --- a/bookwyrm/templates/snippets/status/headers/to_read.html +++ b/bookwyrm/templates/snippets/status/headers/to_read.html @@ -19,4 +19,9 @@ wants to read {{ book }} {% endblocktrans %} {% endif %} + +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} + {% endspaceless %} From 6add81cf158405bdab718bba8378d3485cacb77d Mon Sep 17 00:00:00 2001 From: Braden Solt Date: Sat, 27 Jan 2024 11:02:42 -0700 Subject: [PATCH 051/200] move outside of authors "if" --- bookwyrm/templates/snippets/status/headers/comment.html | 3 ++- .../templates/snippets/status/headers/quotation.html | 3 ++- bookwyrm/templates/snippets/status/headers/read.html | 3 ++- bookwyrm/templates/snippets/status/headers/reading.html | 9 +++++---- bookwyrm/templates/snippets/status/headers/review.html | 3 ++- .../snippets/status/headers/stopped_reading.html | 3 ++- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/snippets/status/headers/comment.html b/bookwyrm/templates/snippets/status/headers/comment.html index b78175bb0..b7750d3df 100644 --- a/bookwyrm/templates/snippets/status/headers/comment.html +++ b/bookwyrm/templates/snippets/status/headers/comment.html @@ -16,9 +16,10 @@ commented on {{ book }} by {{ book }} {% endblocktrans %} +{% endif %} + {% if book.series %} ({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) {% endif %} -{% endif %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/quotation.html b/bookwyrm/templates/snippets/status/headers/quotation.html index 8a6776303..3ddd20291 100644 --- a/bookwyrm/templates/snippets/status/headers/quotation.html +++ b/bookwyrm/templates/snippets/status/headers/quotation.html @@ -16,9 +16,10 @@ quoted {{ book }} by { quoted {{ book }} {% endblocktrans %} +{% endif %} + {% if book.series %} ({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) {% endif %} -{% endif %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/read.html b/bookwyrm/templates/snippets/status/headers/read.html index aaebbd267..8c323dac6 100644 --- a/bookwyrm/templates/snippets/status/headers/read.html +++ b/bookwyrm/templates/snippets/status/headers/read.html @@ -18,9 +18,10 @@ finished reading {{ book }} by {{ book }} {% endblocktrans %} +{% endif %} + {% if book.series %} ({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) {% endif %} -{% endif %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/reading.html b/bookwyrm/templates/snippets/status/headers/reading.html index f773775e0..73e96ebbc 100644 --- a/bookwyrm/templates/snippets/status/headers/reading.html +++ b/bookwyrm/templates/snippets/status/headers/reading.html @@ -12,10 +12,6 @@ started reading {{ book }} by {{ book }} {% endblocktrans %} {% endif %} + +{% if book.series %} +({{book.series}} {%if book.series_number %}#{{book.series_number}}) {% endif %} +{% endif %} + {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/review.html b/bookwyrm/templates/snippets/status/headers/review.html index 371d8b2cb..0bdcd29b1 100644 --- a/bookwyrm/templates/snippets/status/headers/review.html +++ b/bookwyrm/templates/snippets/status/headers/review.html @@ -16,9 +16,10 @@ reviewed {{ book }} by {{ book }} {% endblocktrans %} +{% endif %} + {% if book.series %} ({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) {% endif %} -{% endif %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/stopped_reading.html b/bookwyrm/templates/snippets/status/headers/stopped_reading.html index d3891cb78..a00be181c 100644 --- a/bookwyrm/templates/snippets/status/headers/stopped_reading.html +++ b/bookwyrm/templates/snippets/status/headers/stopped_reading.html @@ -18,10 +18,11 @@ stopped reading {{ book }} by {{ book }} {% endblocktrans %} +{% endif %} + {% if book.series %} ({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) {% endif %} -{% endif %} {% endspaceless %} From 2bb9a855917c3c2ecca9cc32efedf30edc87ea12 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Jan 2024 15:07:55 +1100 Subject: [PATCH 052/200] various fixes - use signed url for s3 downloads - re-arrange tar.gz file to match original - delete all working files after tarring - import from s3 export TODO - check local export and import - fix error when avatar missing - deal with multiple s3 storage options (e.g. Azure) --- .env.example | 1 + ...114_0055.py => 0193_auto_20240128_0249.py} | 4 +- bookwyrm/models/bookwyrm_export_job.py | 46 +++++++++++------ bookwyrm/models/bookwyrm_import_job.py | 13 +++-- .../templates/preferences/export-user.html | 50 ++++++++++++------- bookwyrm/templatetags/utilities.py | 22 +++----- bookwyrm/views/preferences/export.py | 34 ++++++++++++- 7 files changed, 114 insertions(+), 56 deletions(-) rename bookwyrm/migrations/{0192_auto_20240114_0055.py => 0193_auto_20240128_0249.py} (96%) diff --git a/.env.example b/.env.example index 20ce8240b..497d05779 100644 --- a/.env.example +++ b/.env.example @@ -81,6 +81,7 @@ AWS_SECRET_ACCESS_KEY= # 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" +# S3_ENDPOINT_URL=None # same as AWS_S3_ENDPOINT_URL - needed for non-AWS for user exports # Commented are example values if you use Azure Blob Storage # USE_AZURE=true diff --git a/bookwyrm/migrations/0192_auto_20240114_0055.py b/bookwyrm/migrations/0193_auto_20240128_0249.py similarity index 96% rename from bookwyrm/migrations/0192_auto_20240114_0055.py rename to bookwyrm/migrations/0193_auto_20240128_0249.py index 824439728..c1c0527b9 100644 --- a/bookwyrm/migrations/0192_auto_20240114_0055.py +++ b/bookwyrm/migrations/0193_auto_20240128_0249.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.23 on 2024-01-14 00:55 +# Generated by Django 3.2.23 on 2024-01-28 02:49 import bookwyrm.storage_backends import django.core.serializers.json @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0191_merge_20240102_0326"), + ("bookwyrm", "0192_sitesettings_user_exports_enabled"), ] operations = [ diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 4b31b0ddf..384e71701 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -5,6 +5,7 @@ import logging from uuid import uuid4 from s3_tar import S3Tar +from storages.backends.s3boto3 import S3Boto3Storage from django.db.models import CASCADE, BooleanField, FileField, ForeignKey, JSONField from django.db.models import Q @@ -57,7 +58,6 @@ class BookwyrmExportJob(ParentJob): if not self.complete and self.has_completed: if not self.json_completed: - try: self.json_completed = True self.save(update_fields=["json_completed"]) @@ -193,8 +193,7 @@ class AddFileToTar(ChildJob): # NOTE we are doing this all in one big job, which has the potential to block a thread # This is because we need to refer to the same s3_job or BookwyrmTarFile whilst writing - # Alternatives using a series of jobs in a loop would be beter - # but Hugh couldn't make that work + # Using a series of jobs in a loop would be better if possible try: export_data = self.parent_export_job.export_data @@ -203,29 +202,41 @@ class AddFileToTar(ChildJob): user = self.parent_export_job.user editions = get_books_for_user(user) + # filenames for later + export_data_original = str(export_data) + filename = str(self.parent_export_job.task_id) + if settings.USE_S3: s3_job = S3Tar( settings.AWS_STORAGE_BUCKET_NAME, - f"exports/{str(self.parent_export_job.task_id)}.tar.gz", + f"exports/{filename}.tar.gz", ) - # TODO: will need to get it to the user - # from this secure part of the bucket - export_data.save("archive.json", ContentFile(json_data.encode("utf-8"))) - + # save json file + export_data.save( + f"archive_{filename}.json", ContentFile(json_data.encode("utf-8")) + ) s3_job.add_file(f"exports/{export_data.name}") - s3_job.add_file(f"images/{user.avatar.name}", folder="avatar") + + # save image file + file_type = user.avatar.name.rsplit(".", maxsplit=1)[-1] + export_data.save(f"avatar_{filename}.{file_type}", user.avatar) + s3_job.add_file(f"exports/{export_data.name}") + for book in editions: if getattr(book, "cover", False): cover_name = f"images/{book.cover.name}" s3_job.add_file(cover_name, folder="covers") s3_job.tar() - # delete export json as soon as it's tarred - # TODO: there is probably a better way to do this - # Currently this merely makes the file empty even though - # we're using save=False - export_data.delete(save=False) + + # delete child files - we don't need them any more + s3_storage = S3Boto3Storage(querystring_auth=True, custom_domain=None) + S3Boto3Storage.delete(s3_storage, f"exports/{export_data_original}") + S3Boto3Storage.delete(s3_storage, f"exports/archive_{filename}.json") + S3Boto3Storage.delete( + s3_storage, f"exports/avatar_{filename}.{file_type}" + ) else: export_data.open("wb") @@ -266,7 +277,14 @@ def start_export_task(**kwargs): # prepare the initial file and base json job.export_data = ContentFile(b"", str(uuid4())) + # BUG: this throws a MISSING class error if there is no avatar + # #3096 may fix it + if not job.user.avatar: + job.user.avatar = "" + job.user.save() + job.export_json = job.user.to_activity() + logger.info(job.export_json) job.save(update_fields=["export_data", "export_json"]) # let's go diff --git a/bookwyrm/models/bookwyrm_import_job.py b/bookwyrm/models/bookwyrm_import_job.py index 9a11fd932..02af25d12 100644 --- a/bookwyrm/models/bookwyrm_import_job.py +++ b/bookwyrm/models/bookwyrm_import_job.py @@ -42,20 +42,23 @@ def start_import_task(**kwargs): try: archive_file.open("rb") with BookwyrmTarFile.open(mode="r:gz", fileobj=archive_file) as tar: - job.import_data = json.loads(tar.read("archive.json").decode("utf-8")) + json_filename = next( + filter(lambda n: n.startswith("archive"), tar.getnames()) + ) + job.import_data = json.loads(tar.read(json_filename).decode("utf-8")) if "include_user_profile" in job.required: update_user_profile(job.user, tar, job.import_data) if "include_user_settings" in job.required: update_user_settings(job.user, job.import_data) if "include_goals" in job.required: - update_goals(job.user, job.import_data.get("goals")) + update_goals(job.user, job.import_data.get("goals", [])) if "include_saved_lists" in job.required: - upsert_saved_lists(job.user, job.import_data.get("saved_lists")) + upsert_saved_lists(job.user, job.import_data.get("saved_lists", [])) if "include_follows" in job.required: - upsert_follows(job.user, job.import_data.get("follows")) + upsert_follows(job.user, job.import_data.get("follows", [])) if "include_blocks" in job.required: - upsert_user_blocks(job.user, job.import_data.get("blocks")) + upsert_user_blocks(job.user, job.import_data.get("blocks", [])) process_books(job, tar) diff --git a/bookwyrm/templates/preferences/export-user.html b/bookwyrm/templates/preferences/export-user.html index cd3119e3e..764d51db9 100644 --- a/bookwyrm/templates/preferences/export-user.html +++ b/bookwyrm/templates/preferences/export-user.html @@ -92,25 +92,25 @@ {% endif %} - {% for job in jobs %} + {% for export in jobs %} - {{ job.updated_date }} + {{ export.job.updated_date }} - {% if job.status %} - {{ job.status }} - {{ job.status_display }} - {% elif job.complete %} + {% if export.job.status %} + {{ export.job.status }} + {{ export.job.status_display }} + {% elif export.job.complete %} {% trans "Complete" %} {% else %} {% trans "Active" %} @@ -118,18 +118,30 @@ - {{ job.export_data|get_file_size }} + {{ export.size|get_file_size }} - {% if job.complete and not job.status == "stopped" and not job.status == "failed" %} -

    - - - - {% trans "Download your export" %} - - -

    + {% if export.job.complete and not export.job.status == "stopped" and not export.job.status == "failed" %} + {% if export.url%} +

    + + + + {% trans "Download your export" %} + + +

    + {% else %} +

    + + + + {% trans "Download your export" %} + + +

    + {% endif %} + {% endif %} diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 225510085..e04c9f33a 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -130,23 +130,17 @@ def id_to_username(user_id): @register.filter(name="get_file_size") -def get_file_size(file): +def get_file_size(raw_size): """display the size of a file in human readable terms""" try: - # TODO: this obviously isn't a proper solution - # boto storages do not implement 'path' - if not USE_S3: - raw_size = os.stat(file.path).st_size - if raw_size < 1024: - return f"{raw_size} bytes" - if raw_size < 1024**2: - return f"{raw_size/1024:.2f} KB" - if raw_size < 1024**3: - return f"{raw_size/1024**2:.2f} MB" - return f"{raw_size/1024**3:.2f} GB" - - return "" + if raw_size < 1024: + return f"{raw_size} bytes" + if raw_size < 1024**2: + return f"{raw_size/1024:.2f} KB" + if raw_size < 1024**3: + return f"{raw_size/1024**2:.2f} MB" + return f"{raw_size/1024**3:.2f} GB" except Exception as error: # pylint: disable=broad-except print(error) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 33c90291d..bd32d45ad 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -13,9 +13,11 @@ from django.views import View from django.utils.decorators import method_decorator from django.shortcuts import redirect +from storages.backends.s3boto3 import S3Boto3Storage + from bookwyrm import models from bookwyrm.models.bookwyrm_export_job import BookwyrmExportJob -from bookwyrm.settings import PAGE_LENGTH +from bookwyrm import settings # pylint: disable=no-self-use,too-many-locals @@ -152,6 +154,34 @@ class ExportUser(View): jobs = BookwyrmExportJob.objects.filter(user=request.user).order_by( "-created_date" ) + + exports = [] + for job in jobs: + export = {"job": job} + + if settings.USE_S3: + # make custom_domain None so we can sign the url (https://github.com/jschneier/django-storages/issues/944) + storage = S3Boto3Storage(querystring_auth=True, custom_domain=None) + + # for s3 we download directly from s3, so we need a signed url + export["url"] = S3Boto3Storage.url( + storage, f"/exports/{job.task_id}.tar.gz", expire=900 + ) # temporarily downloadable file, expires after 5 minutes + + # for s3 we create a new tar file in s3, so we need to check the size of _that_ file + try: + export["size"] = S3Boto3Storage.size( + storage, f"exports/{job.task_id}.tar.gz" + ) + except Exception: + export["size"] = 0 + + else: + # for local storage export_data is the tar file + export["size"] = job.export_data.size if job.export_data else 0 + + exports.append(export) + site = models.SiteSettings.objects.get() hours = site.user_import_time_limit allowed = ( @@ -162,7 +192,7 @@ class ExportUser(View): next_available = ( jobs.first().created_date + timedelta(hours=hours) if not allowed else False ) - paginated = Paginator(jobs, PAGE_LENGTH) + paginated = Paginator(exports, settings.PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = { "jobs": page, From a3e05254b56cd51574bf1d25c9ecba6c1f3f8862 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Jan 2024 15:56:44 +1100 Subject: [PATCH 053/200] fix avatar import path --- bookwyrm/models/bookwyrm_export_job.py | 74 +++++++++++++------------- bookwyrm/models/bookwyrm_import_job.py | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 384e71701..a611ba4b1 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -246,9 +246,7 @@ class AddFileToTar(ChildJob): # Add avatar image if present if getattr(user, "avatar", False): - tar.add_image( - user.avatar, filename="avatar", directory="avatar/" - ) + tar.add_image(user.avatar, filename="avatar") for book in editions: if getattr(book, "cover", False): @@ -284,7 +282,6 @@ def start_export_task(**kwargs): job.user.save() job.export_json = job.user.to_activity() - logger.info(job.export_json) job.save(update_fields=["export_data", "export_json"]) # let's go @@ -345,45 +342,48 @@ def export_reading_goals_task(**kwargs): def json_export(**kwargs): """Generate an export for a user""" - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) - job.set_status("active") - job_id = kwargs["job_id"] + try: + job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + job.set_status("active") + job_id = kwargs["job_id"] - # I don't love this but it prevents a JSON encoding error - # when there is no user image - if isinstance( - job.export_json["icon"], - dataclasses._MISSING_TYPE, # pylint: disable=protected-access - ): - job.export_json["icon"] = {} - else: - # change the URL to be relative to the JSON file - file_type = job.export_json["icon"]["url"].rsplit(".", maxsplit=1)[-1] - filename = f"avatar.{file_type}" - job.export_json["icon"]["url"] = filename + if not job.export_json.get("icon"): + job.export_json["icon"] = {} + else: + # change the URL to be relative to the JSON file + file_type = job.export_json["icon"]["url"].rsplit(".", maxsplit=1)[-1] + filename = f"avatar.{file_type}" + job.export_json["icon"]["url"] = filename - # Additional settings - can't be serialized as AP - vals = [ - "show_goal", - "preferred_timezone", - "default_post_privacy", - "show_suggested_users", - ] - job.export_json["settings"] = {} - for k in vals: - job.export_json["settings"][k] = getattr(job.user, k) + # Additional settings - can't be serialized as AP + vals = [ + "show_goal", + "preferred_timezone", + "default_post_privacy", + "show_suggested_users", + ] + job.export_json["settings"] = {} + for k in vals: + job.export_json["settings"][k] = getattr(job.user, k) - job.export_json["books"] = [] + job.export_json["books"] = [] - # save settings we just updated - job.save(update_fields=["export_json"]) + # save settings we just updated + job.save(update_fields=["export_json"]) - # trigger subtasks - export_saved_lists_task.delay(job_id=job_id, no_children=False) - export_follows_task.delay(job_id=job_id, no_children=False) - export_blocks_task.delay(job_id=job_id, no_children=False) - trigger_books_jobs.delay(job_id=job_id, no_children=False) + # trigger subtasks + export_saved_lists_task.delay(job_id=job_id, no_children=False) + export_follows_task.delay(job_id=job_id, no_children=False) + export_blocks_task.delay(job_id=job_id, no_children=False) + trigger_books_jobs.delay(job_id=job_id, no_children=False) + except Exception as err: # pylint: disable=broad-except + logger.exception( + "json_export task in job %s Failed with error: %s", + job.id, + err, + ) + job.set_status("failed") @app.task(queue=IMPORTS, base=ParentTask) def trigger_books_jobs(**kwargs): diff --git a/bookwyrm/models/bookwyrm_import_job.py b/bookwyrm/models/bookwyrm_import_job.py index 02af25d12..5229430eb 100644 --- a/bookwyrm/models/bookwyrm_import_job.py +++ b/bookwyrm/models/bookwyrm_import_job.py @@ -215,7 +215,7 @@ def upsert_statuses(user, cls, data, book_remote_id): instance.save() # save and broadcast else: - logger.info("User does not have permission to import statuses") + logger.warning("User does not have permission to import statuses") def upsert_lists(user, lists, book_id): From 2c231acebe3aeccbd11e255865b281579d1767e7 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Jan 2024 20:35:47 +1100 Subject: [PATCH 054/200] linting and tests --- bookwyrm/models/bookwyrm_export_job.py | 16 +-- bookwyrm/templatetags/utilities.py | 2 +- .../tests/models/test_bookwyrm_export_job.py | 105 +++--------------- .../views/preferences/test_export_user.py | 3 +- bookwyrm/views/preferences/export.py | 8 +- 5 files changed, 28 insertions(+), 106 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index a611ba4b1..2d87b203f 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -1,6 +1,5 @@ """Export user account to tar.gz file for import into another Bookwyrm instance""" -import dataclasses import logging from uuid import uuid4 @@ -191,9 +190,11 @@ class AddFileToTar(ChildJob): def start_job(self): """Start the job""" - # NOTE we are doing this all in one big job, which has the potential to block a thread - # This is because we need to refer to the same s3_job or BookwyrmTarFile whilst writing - # Using a series of jobs in a loop would be better if possible + # NOTE we are doing this all in one big job, + # which has the potential to block a thread + # This is because we need to refer to the same s3_job + # or BookwyrmTarFile whilst writing + # Using a series of jobs in a loop would be better try: export_data = self.parent_export_job.export_data @@ -275,12 +276,6 @@ def start_export_task(**kwargs): # prepare the initial file and base json job.export_data = ContentFile(b"", str(uuid4())) - # BUG: this throws a MISSING class error if there is no avatar - # #3096 may fix it - if not job.user.avatar: - job.user.avatar = "" - job.user.save() - job.export_json = job.user.to_activity() job.save(update_fields=["export_data", "export_json"]) @@ -385,6 +380,7 @@ def json_export(**kwargs): ) job.set_status("failed") + @app.task(queue=IMPORTS, base=ParentTask) def trigger_books_jobs(**kwargs): """trigger tasks to get data for each book""" diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index e04c9f33a..e4ddbb47c 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -9,7 +9,7 @@ from django.utils.translation import gettext_lazy as _ from django.templatetags.static import static from bookwyrm.models import User -from bookwyrm.settings import INSTANCE_ACTOR_USERNAME, USE_S3 +from bookwyrm.settings import INSTANCE_ACTOR_USERNAME register = template.Library() diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index f0b9e445b..cf3ba0688 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -5,13 +5,15 @@ from unittest.mock import patch from django.core.serializers.json import DjangoJSONEncoder from django.test import TestCase +from django.test.utils import override_settings + from django.utils import timezone from bookwyrm import models import bookwyrm.models.bookwyrm_export_job as export_job -class BookwyrmExport(TestCase): +class BookwyrmExportJob(TestCase): """testing user export functions""" def setUp(self): @@ -141,94 +143,17 @@ class BookwyrmExport(TestCase): book=self.edition, ) - # pylint: disable=E1121 - def test_json_export_user_settings(self): - """Test the json export function for basic user info""" - data = export_job.json_export(self.local_user) - user_data = json.loads(data) - self.assertEqual(user_data["preferredUsername"], "mouse") - self.assertEqual(user_data["name"], "Mouse") - self.assertEqual(user_data["summary"], "

    I'm a real bookmouse

    ") - self.assertEqual(user_data["manuallyApprovesFollowers"], False) - self.assertEqual(user_data["hideFollows"], False) - self.assertEqual(user_data["discoverable"], True) - self.assertEqual(user_data["settings"]["show_goal"], False) - self.assertEqual(user_data["settings"]["show_suggested_users"], False) - self.assertEqual( - user_data["settings"]["preferred_timezone"], "America/Los Angeles" - ) - self.assertEqual(user_data["settings"]["default_post_privacy"], "followers") + self.job = models.BookwyrmExportJob.objects.create(user=self.local_user) - # pylint: disable=E1121 - def test_json_export_extended_user_data(self): - """Test the json export function for other non-book user info""" - data = export_job.json_export(self.local_user) - json_data = json.loads(data) + def test_export_saved_lists_task(self): + """test saved list task""" - # goal - self.assertEqual(len(json_data["goals"]), 1) - self.assertEqual(json_data["goals"][0]["goal"], 128937123) - self.assertEqual(json_data["goals"][0]["year"], timezone.now().year) - self.assertEqual(json_data["goals"][0]["privacy"], "followers") - - # saved lists - self.assertEqual(len(json_data["saved_lists"]), 1) - self.assertEqual(json_data["saved_lists"][0], "https://local.lists/9999") - - # follows - self.assertEqual(len(json_data["follows"]), 1) - self.assertEqual(json_data["follows"][0], "https://your.domain.here/user/rat") - # blocked users - self.assertEqual(len(json_data["blocks"]), 1) - self.assertEqual(json_data["blocks"][0], "https://your.domain.here/user/badger") - - # pylint: disable=E1121 - def test_json_export_books(self): - """Test the json export function for extended user info""" - - data = export_job.json_export(self.local_user) - json_data = json.loads(data) - start_date = json_data["books"][0]["readthroughs"][0]["start_date"] - - self.assertEqual(len(json_data["books"]), 1) - self.assertEqual(json_data["books"][0]["edition"]["title"], "Example Edition") - self.assertEqual(len(json_data["books"][0]["authors"]), 1) - self.assertEqual(json_data["books"][0]["authors"][0]["name"], "Sam Zhu") - - self.assertEqual( - f'"{start_date}"', DjangoJSONEncoder().encode(self.readthrough_start) - ) - - self.assertEqual(json_data["books"][0]["shelves"][0]["name"], "Read") - - self.assertEqual(len(json_data["books"][0]["lists"]), 1) - self.assertEqual(json_data["books"][0]["lists"][0]["name"], "My excellent list") - self.assertEqual( - json_data["books"][0]["lists"][0]["list_item"]["book"], - self.edition.remote_id, - self.edition.id, - ) - - self.assertEqual(len(json_data["books"][0]["reviews"]), 1) - self.assertEqual(len(json_data["books"][0]["comments"]), 1) - self.assertEqual(len(json_data["books"][0]["quotations"]), 1) - - self.assertEqual(json_data["books"][0]["reviews"][0]["name"], "my review") - self.assertEqual( - json_data["books"][0]["reviews"][0]["content"], "

    awesome

    " - ) - self.assertEqual(json_data["books"][0]["reviews"][0]["rating"], 5.0) - - self.assertEqual( - json_data["books"][0]["comments"][0]["content"], "

    ok so far

    " - ) - self.assertEqual(json_data["books"][0]["comments"][0]["progress"], 15) - self.assertEqual(json_data["books"][0]["comments"][0]["progress_mode"], "PG") - - self.assertEqual( - json_data["books"][0]["quotations"][0]["content"], "

    check this out

    " - ) - self.assertEqual( - json_data["books"][0]["quotations"][0]["quote"], - "

    A rose by any other name

    ", - ) + with patch("bookwyrm.models.bookwyrm_export_job.json_export.delay"): + models.bookwyrm_export_job.start_export_task( + job_id=self.job.id, no_children=False + ) + print(self.job.user) + print(self.job.export_data) + print(self.job.export_json) + # IDK how to test this... + pass diff --git a/bookwyrm/tests/views/preferences/test_export_user.py b/bookwyrm/tests/views/preferences/test_export_user.py index 654ed2a05..e40081eb1 100644 --- a/bookwyrm/tests/views/preferences/test_export_user.py +++ b/bookwyrm/tests/views/preferences/test_export_user.py @@ -41,8 +41,7 @@ class ExportUserViews(TestCase): request = self.factory.post("") request.user = self.local_user - with patch("bookwyrm.models.bookwyrm_export_job.start_export_task.delay"): - export = views.ExportUser.as_view()(request) + export = views.ExportUser.as_view()(request) self.assertIsInstance(export, HttpResponse) self.assertEqual(export.status_code, 302) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index bd32d45ad..54d6df261 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -160,7 +160,8 @@ class ExportUser(View): export = {"job": job} if settings.USE_S3: - # make custom_domain None so we can sign the url (https://github.com/jschneier/django-storages/issues/944) + # make custom_domain None so we can sign the url + # see https://github.com/jschneier/django-storages/issues/944 storage = S3Boto3Storage(querystring_auth=True, custom_domain=None) # for s3 we download directly from s3, so we need a signed url @@ -168,12 +169,13 @@ class ExportUser(View): storage, f"/exports/{job.task_id}.tar.gz", expire=900 ) # temporarily downloadable file, expires after 5 minutes - # for s3 we create a new tar file in s3, so we need to check the size of _that_ file + # for s3 we create a new tar file in s3, + # so we need to check the size of _that_ file try: export["size"] = S3Boto3Storage.size( storage, f"exports/{job.task_id}.tar.gz" ) - except Exception: + except Exception: # pylint: disable=broad-except export["size"] = 0 else: From c106b2a988296c4bc4ad65d82a2676b8fd796d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 28 Jan 2024 22:00:40 -0300 Subject: [PATCH 055/200] Subclass boto3.Session to use AWS_S3_ENDPOINT_URL As of 0.1.13, the s3-tar library uses an environment variable (`S3_ENDPOINT_URL`) to determine the AWS endpoint. See: https://github.com/xtream1101/s3-tar/blob/0.1.13/s3_tar/utils.py#L25-L29. To save BookWyrm admins from having to set it (e.g., through `.env`) when they are already setting `AWS_S3_ENDPOINT_URL`, we create a Session class that unconditionally uses that URL, and feed it to S3Tar. --- bookwyrm/models/bookwyrm_export_job.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 2d87b203f..610ec13d8 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -3,6 +3,7 @@ import logging from uuid import uuid4 +from boto3.session import Session as BotoSession from s3_tar import S3Tar from storages.backends.s3boto3 import S3Boto3Storage @@ -25,6 +26,14 @@ from bookwyrm.utils.tar import BookwyrmTarFile logger = logging.getLogger(__name__) +class BookwyrmAwsSession(BotoSession): + """a boto session that always uses settings.AWS_S3_ENDPOINT_URL""" + + def client(service_name, **kwargs): + kwargs["endpoint_url"] = settings.AWS_S3_ENDPOINT_URL + return super().client(service_name, **kwargs) + + class BookwyrmExportJob(ParentJob): """entry for a specific request to export a bookwyrm user""" @@ -211,6 +220,7 @@ class AddFileToTar(ChildJob): s3_job = S3Tar( settings.AWS_STORAGE_BUCKET_NAME, f"exports/{filename}.tar.gz", + session=BookwyrmAwsSession(), ) # save json file From 765fc1e43d19e9c8cdf91a6f72a47eb2ab18721a Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Jan 2024 12:28:37 +1100 Subject: [PATCH 056/200] fix tests --- .../tests/models/test_bookwyrm_export_job.py | 142 ++++++++++++++++-- .../views/preferences/test_export_user.py | 3 +- 2 files changed, 130 insertions(+), 15 deletions(-) diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index cf3ba0688..267d30217 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -1,16 +1,11 @@ """test bookwyrm user export functions""" import datetime -import json from unittest.mock import patch -from django.core.serializers.json import DjangoJSONEncoder -from django.test import TestCase -from django.test.utils import override_settings - from django.utils import timezone +from django.test import TestCase from bookwyrm import models -import bookwyrm.models.bookwyrm_export_job as export_job class BookwyrmExportJob(TestCase): @@ -143,17 +138,136 @@ class BookwyrmExportJob(TestCase): book=self.edition, ) - self.job = models.BookwyrmExportJob.objects.create(user=self.local_user) + self.job = models.BookwyrmExportJob.objects.create( + user=self.local_user, export_json={} + ) - def test_export_saved_lists_task(self): - """test saved list task""" + def test_add_book_to_user_export_job(self): + """does AddBookToUserExportJob ...add the book to the export?""" + + self.job.export_json["books"] = [] + self.job.save() + + with patch("bookwyrm.models.bookwyrm_export_job.AddFileToTar.start_job"): + model = models.bookwyrm_export_job + edition_job = model.AddBookToUserExportJob.objects.create( + edition=self.edition, parent_job=self.job + ) + + edition_job.start_job() + + self.job.refresh_from_db() + self.assertIsNotNone(self.job.export_json["books"]) + self.assertEqual(len(self.job.export_json["books"]), 1) + book = self.job.export_json["books"][0] + self.assertEqual(book["work"]["id"], self.work.remote_id) + self.assertEqual(len(book["authors"]), 1) + self.assertEqual(len(book["shelves"]), 1) + self.assertEqual(len(book["lists"]), 1) + self.assertEqual(len(book["comments"]), 1) + self.assertEqual(len(book["reviews"]), 1) + self.assertEqual(len(book["quotations"]), 1) + self.assertEqual(len(book["readthroughs"]), 1) + + def test_start_export_task(self): + """test saved list task saves initial json and data""" with patch("bookwyrm.models.bookwyrm_export_job.json_export.delay"): models.bookwyrm_export_job.start_export_task( job_id=self.job.id, no_children=False ) - print(self.job.user) - print(self.job.export_data) - print(self.job.export_json) - # IDK how to test this... - pass + + self.job.refresh_from_db() + + self.assertIsNotNone(self.job.export_data) + self.assertIsNotNone(self.job.export_json) + self.assertEqual(self.job.export_json["name"], self.local_user.name) + + def test_export_saved_lists_task(self): + """test export_saved_lists_task adds the saved lists""" + + models.bookwyrm_export_job.export_saved_lists_task( + job_id=self.job.id, no_children=False + ) + + self.job.refresh_from_db() + + self.assertIsNotNone(self.job.export_json["saved_lists"]) + self.assertEqual( + self.job.export_json["saved_lists"][0], self.saved_list.remote_id + ) + + def test_export_follows_task(self): + """test export_follows_task adds the follows""" + + models.bookwyrm_export_job.export_follows_task( + job_id=self.job.id, no_children=False + ) + + self.job.refresh_from_db() + + self.assertIsNotNone(self.job.export_json["follows"]) + self.assertEqual(self.job.export_json["follows"][0], self.rat_user.remote_id) + + def test_export_blocks_task(self): + + """test export_blocks_task adds the blocks""" + + models.bookwyrm_export_job.export_blocks_task( + job_id=self.job.id, no_children=False + ) + + self.job.refresh_from_db() + + self.assertIsNotNone(self.job.export_json["blocks"]) + self.assertEqual(self.job.export_json["blocks"][0], self.badger_user.remote_id) + + def test_export_reading_goals_task(self): + """test export_reading_goals_task adds the goals""" + + models.bookwyrm_export_job.export_reading_goals_task( + job_id=self.job.id, no_children=False + ) + + self.job.refresh_from_db() + + self.assertIsNotNone(self.job.export_json["goals"]) + self.assertEqual(self.job.export_json["goals"][0]["goal"], 128937123) + + def test_json_export(self): + """test json_export job adds settings""" + + with patch( + "bookwyrm.models.bookwyrm_export_job.export_saved_lists_task.delay" + ), patch( + "bookwyrm.models.bookwyrm_export_job.export_follows_task.delay" + ), patch( + "bookwyrm.models.bookwyrm_export_job.export_blocks_task.delay" + ), patch( + "bookwyrm.models.bookwyrm_export_job.trigger_books_jobs.delay" + ): + + models.bookwyrm_export_job.json_export( + job_id=self.job.id, no_children=False + ) + + self.job.refresh_from_db() + + self.assertIsNotNone(self.job.export_json["settings"]) + self.assertFalse(self.job.export_json["settings"]["show_goal"]) + self.assertEqual( + self.job.export_json["settings"]["preferred_timezone"], + "America/Los Angeles", + ) + self.assertEqual( + self.job.export_json["settings"]["default_post_privacy"], "followers" + ) + self.assertFalse(self.job.export_json["settings"]["show_suggested_users"]) + + def test_get_books_for_user(self): + """does get_books_for_user get all the books""" + + data = models.bookwyrm_export_job.get_books_for_user(self.local_user) + + self.assertEqual(len(data), 1) + self.assertEqual(data[0].title, "Example Edition") diff --git a/bookwyrm/tests/views/preferences/test_export_user.py b/bookwyrm/tests/views/preferences/test_export_user.py index e40081eb1..98892f6b8 100644 --- a/bookwyrm/tests/views/preferences/test_export_user.py +++ b/bookwyrm/tests/views/preferences/test_export_user.py @@ -41,7 +41,8 @@ class ExportUserViews(TestCase): request = self.factory.post("") request.user = self.local_user - export = views.ExportUser.as_view()(request) + with patch("bookwyrm.models.bookwyrm_export_job.BookwyrmExportJob.start_job"): + export = views.ExportUser.as_view()(request) self.assertIsInstance(export, HttpResponse) self.assertEqual(export.status_code, 302) From adff3c425153262811bd8930d0c2a2d842edaed9 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Jan 2024 13:45:35 +1100 Subject: [PATCH 057/200] allow user exports with s3 also undoes a line space change in settings.py to make the PR cleaner --- bookwyrm/settings.py | 1 + bookwyrm/templates/settings/imports/imports.html | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 3f9665baf..cc941da84 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -442,4 +442,5 @@ if HTTP_X_FORWARDED_PROTO: # Do not change this setting unless you already have an existing # user with the same username - in which case you should change it! INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" + DATA_UPLOAD_MAX_MEMORY_SIZE = env.int("DATA_UPLOAD_MAX_MEMORY_SIZE", (1024**2 * 100)) diff --git a/bookwyrm/templates/settings/imports/imports.html b/bookwyrm/templates/settings/imports/imports.html index 11b3c7e03..ca53dd410 100644 --- a/bookwyrm/templates/settings/imports/imports.html +++ b/bookwyrm/templates/settings/imports/imports.html @@ -157,13 +157,10 @@ >

    {% trans "Users are currently unable to start new user exports. This is the default setting." %}

    - {% if use_s3 %} -

    {% trans "It is not currently possible to provide user exports when using s3 storage. The BookWyrm development team are working on a fix for this." %}

    - {% endif %}
    {% csrf_token %}
    -
    From 5f7be848fc3f3ccea46c434fd6e9aae68bb04035 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Jan 2024 14:10:36 +1100 Subject: [PATCH 058/200] subclass boto3 session instead of adding new env value Thanks Dato! --- .env.example | 1 - bookwyrm/models/bookwyrm_export_job.py | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index 497d05779..20ce8240b 100644 --- a/.env.example +++ b/.env.example @@ -81,7 +81,6 @@ AWS_SECRET_ACCESS_KEY= # 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" -# S3_ENDPOINT_URL=None # same as AWS_S3_ENDPOINT_URL - needed for non-AWS for user exports # Commented are example values if you use Azure Blob Storage # USE_AZURE=true diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 610ec13d8..0cb726aa1 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -29,9 +29,9 @@ logger = logging.getLogger(__name__) class BookwyrmAwsSession(BotoSession): """a boto session that always uses settings.AWS_S3_ENDPOINT_URL""" - def client(service_name, **kwargs): + def client(self, *args, **kwargs): # pylint: disable=arguments-differ kwargs["endpoint_url"] = settings.AWS_S3_ENDPOINT_URL - return super().client(service_name, **kwargs) + return super().client("s3", *args, **kwargs) class BookwyrmExportJob(ParentJob): @@ -42,9 +42,7 @@ class BookwyrmExportJob(ParentJob): else: storage = storage_backends.ExportsFileStorage - export_data = FileField( - null=True, storage=storage - ) # use custom storage backend here + export_data = FileField(null=True, storage=storage) export_json = JSONField(null=True, encoder=DjangoJSONEncoder) json_completed = BooleanField(default=False) @@ -70,7 +68,6 @@ class BookwyrmExportJob(ParentJob): self.json_completed = True self.save(update_fields=["json_completed"]) - # add json file to tarfile tar_job = AddFileToTar.objects.create( parent_job=self, parent_export_job=self ) From 3675a4cf3f0076cb1885715ad7d6f034308936ec Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Jan 2024 14:28:30 +1100 Subject: [PATCH 059/200] disable user exports if using azure --- bookwyrm/templates/settings/imports/imports.html | 5 ++++- bookwyrm/views/admin/imports.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/settings/imports/imports.html b/bookwyrm/templates/settings/imports/imports.html index ca53dd410..8693f7b68 100644 --- a/bookwyrm/templates/settings/imports/imports.html +++ b/bookwyrm/templates/settings/imports/imports.html @@ -157,10 +157,13 @@ >

    {% trans "Users are currently unable to start new user exports. This is the default setting." %}

    + {% if use_azure %} +

    {% trans "It is not currently possible to provide user exports when using Azure storage." %}

    + {% endif %}
    {% csrf_token %}
    -
    diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py index 0924536bf..1009f4149 100644 --- a/bookwyrm/views/admin/imports.py +++ b/bookwyrm/views/admin/imports.py @@ -9,7 +9,7 @@ from django.views.decorators.http import require_POST from bookwyrm import models from bookwyrm.views.helpers import redirect_to_referer -from bookwyrm.settings import PAGE_LENGTH, USE_S3 +from bookwyrm.settings import PAGE_LENGTH, USE_AZURE # pylint: disable=no-self-use @@ -59,7 +59,7 @@ class ImportList(View): "import_size_limit": site_settings.import_size_limit, "import_limit_reset": site_settings.import_limit_reset, "user_import_time_limit": site_settings.user_import_time_limit, - "use_s3": USE_S3, + "use_azure": USE_AZURE, } return TemplateResponse(request, "settings/imports/imports.html", data) From b05621005e14818fd4d529c06b38b4c433a7832d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 00:10:13 +0000 Subject: [PATCH 060/200] Bump aiohttp from 3.9.0 to 3.9.2 Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.0 to 3.9.2. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.0...v3.9.2) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6509effc7..41b6bd16d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.0 +aiohttp==3.9.2 bleach==5.0.1 celery==5.2.7 colorthief==0.2.1 From 2ba7dff845e7211a22c390e32e590f84b16311fd Mon Sep 17 00:00:00 2001 From: Jacob Kerr Date: Wed, 3 Jan 2024 21:54:25 -0500 Subject: [PATCH 061/200] Fixed shelving date changing when changing editions --- bookwyrm/views/books/editions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index 54d1bd84c..5202531f5 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -93,6 +93,7 @@ def switch_edition(request): user=shelfbook.user, shelf=shelfbook.shelf, book=new_edition, + shelved_date=shelfbook.shelved_date, ) shelfbook.delete() From 9c5f6c527bd9ae1954a22d695f43f1c8f2c82907 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Feb 2024 06:51:23 -0800 Subject: [PATCH 062/200] Fixes translation tags --- .../templates/preferences/export-user.html | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/bookwyrm/templates/preferences/export-user.html b/bookwyrm/templates/preferences/export-user.html index 58b27f3c1..955cff656 100644 --- a/bookwyrm/templates/preferences/export-user.html +++ b/bookwyrm/templates/preferences/export-user.html @@ -14,31 +14,29 @@

    {% trans "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." %}

    - {% blocktrans trimmed %}
    -

    Your file will include:

    +

    {% trans "Your file will include:" %}

      -
    • User profile
      • -
    • Most user settings
      • -
    • Reading goals
      • -
    • Shelves
      • -
    • Reading history
      • -
    • Book reviews
      • -
    • Statuses
      • -
    • Your own lists and saved lists
      • -
    • Which users you follow and block
      • +
    • {% trans "User profile" %}
      • +
    • {% trans "Most user settings" %}
      • +
    • {% trans "Reading goals" %}
      • +
    • {% trans "Shelves" %}
      • +
    • {% trans "Reading history" %}
      • +
    • {% trans "Book reviews" %}
      • +
    • {% trans "Statuses" %}
      • +
    • {% trans "Your own lists and saved lists" %}
      • +
    • {% trans "Which users you follow and block" %}
    -

    Your file will not include:

    +

    {% trans "Your file will not include:" %}

      -
    • Direct messages
      • -
    • Replies to your statuses
      • -
    • Groups
      • -
    • Favorites
      • +
    • {% trans "Direct messages" %}
      • +
    • {% trans "Replies to your statuses" %}
      • +
    • {% trans "Groups" %}
      • +
    • {% trans "Favorites" %}
    - {% endblocktrans %}

    {% trans "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." %}

    @@ -50,11 +48,11 @@

    {% trans "New user exports are currently disabled." %} {% if perms.bookwyrm.edit_instance_settings %} - {% spaceless %} - {% blocktrans%} -
    User exports settings can be changed from the Imports page in the Admin dashboard. +
    + {% url 'settings-imports' as url %} + {% blocktrans trimmed %} + User exports settings can be changed from the Imports page in the Admin dashboard. {% endblocktrans %} - {% endspaceless %} {% endif%}

    {% elif next_available %} From 6d5752fb4ee72287ed15b84726872a4608842159 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Feb 2024 07:40:23 -0800 Subject: [PATCH 063/200] Adds merge migration for page numbering fix --- bookwyrm/migrations/0193_merge_20240203_1539.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0193_merge_20240203_1539.py diff --git a/bookwyrm/migrations/0193_merge_20240203_1539.py b/bookwyrm/migrations/0193_merge_20240203_1539.py new file mode 100644 index 000000000..a88568ba1 --- /dev/null +++ b/bookwyrm/migrations/0193_merge_20240203_1539.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.23 on 2024-02-03 15:39 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0192_make_page_positions_text"), + ("bookwyrm", "0192_sitesettings_user_exports_enabled"), + ] + + operations = [] From a1ac9494b28ecd1a1674926d7aad8e82d2502dcf Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Feb 2024 08:00:07 -0800 Subject: [PATCH 064/200] Allow admins to un-schedule tasks --- bookwyrm/templates/settings/schedules.html | 11 +++++++++++ bookwyrm/urls.py | 2 +- bookwyrm/views/admin/schedule.py | 8 ++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/settings/schedules.html b/bookwyrm/templates/settings/schedules.html index fe096092d..20ced4b30 100644 --- a/bookwyrm/templates/settings/schedules.html +++ b/bookwyrm/templates/settings/schedules.html @@ -61,7 +61,18 @@ {{ task.interval.id }} + + {% if task.enabled %} + + {% endif %} {{ task.enabled|yesno }} + + {% if task.name != "celery.backend_cleanup" %} + + {% csrf_token %} + + + {% endif %} {% empty %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 64742347a..a40dcebea 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -360,7 +360,7 @@ urlpatterns = [ r"^settings/celery/ping/?$", views.celery_ping, name="settings-celery-ping" ), re_path( - r"^settings/schedules/?$", + r"^settings/schedules/(?P\d+)?$", views.ScheduledTasks.as_view(), name="settings-schedules", ), diff --git a/bookwyrm/views/admin/schedule.py b/bookwyrm/views/admin/schedule.py index ce5944ee5..c654dca9a 100644 --- a/bookwyrm/views/admin/schedule.py +++ b/bookwyrm/views/admin/schedule.py @@ -1,5 +1,6 @@ """ Scheduled celery tasks """ from django.contrib.auth.decorators import login_required, permission_required +from django.shortcuts import redirect from django.template.response import TemplateResponse from django.utils.decorators import method_decorator from django.views import View @@ -21,3 +22,10 @@ class ScheduledTasks(View): data["tasks"] = PeriodicTask.objects.all() data["schedules"] = IntervalSchedule.objects.all() return TemplateResponse(request, "settings/schedules.html", data) + + # pylint: disable=unused-argument + def post(self, request, task_id): + """un-schedule a task""" + task = PeriodicTask.objects.get(id=task_id) + task.delete() + return redirect("settings-schedules") From 4e2b8af1479bd35bf2b5c5973ff0ae2b4bb1a4fc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Feb 2024 08:02:51 -0800 Subject: [PATCH 065/200] Adds merge migration --- bookwyrm/migrations/0193_merge_20240203_1602.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0193_merge_20240203_1602.py diff --git a/bookwyrm/migrations/0193_merge_20240203_1602.py b/bookwyrm/migrations/0193_merge_20240203_1602.py new file mode 100644 index 000000000..e5f760539 --- /dev/null +++ b/bookwyrm/migrations/0193_merge_20240203_1602.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.23 on 2024-02-03 16:02 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0192_rename_version_sitesettings_available_version"), + ("bookwyrm", "0192_sitesettings_user_exports_enabled"), + ] + + operations = [] From 748c9349865f063689adcaa61e46a26fa3e3bcae Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Feb 2024 08:20:12 -0800 Subject: [PATCH 066/200] Merge migrations upon merge migrations --- ...193_merge_20240203_1602.py => 0194_merge_20240203_1619.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/migrations/{0193_merge_20240203_1602.py => 0194_merge_20240203_1619.py} (63%) diff --git a/bookwyrm/migrations/0193_merge_20240203_1602.py b/bookwyrm/migrations/0194_merge_20240203_1619.py similarity index 63% rename from bookwyrm/migrations/0193_merge_20240203_1602.py rename to bookwyrm/migrations/0194_merge_20240203_1619.py index e5f760539..a5c18e300 100644 --- a/bookwyrm/migrations/0193_merge_20240203_1602.py +++ b/bookwyrm/migrations/0194_merge_20240203_1619.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.23 on 2024-02-03 16:02 +# Generated by Django 3.2.23 on 2024-02-03 16:19 from django.db import migrations @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ ("bookwyrm", "0192_rename_version_sitesettings_available_version"), - ("bookwyrm", "0192_sitesettings_user_exports_enabled"), + ("bookwyrm", "0193_merge_20240203_1539"), ] operations = [] From 6c9ca0bf190552597890c2aaefca614c0058f914 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 3 Feb 2024 21:55:46 +0100 Subject: [PATCH 067/200] Add search for author --- bookwyrm/templates/layout.html | 2 +- bookwyrm/templates/search/author.html | 17 +++++++++++++++++ bookwyrm/templates/search/layout.html | 4 ++++ bookwyrm/views/search.py | 27 +++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 bookwyrm/templates/search/author.html diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 6283e61c4..ced4e8006 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -36,7 +36,7 @@
    {% if request.user.is_authenticated %} - {% trans "Search for a book, user, or list" as search_placeholder %} + {% trans "Search for a book, author, user, or list" as search_placeholder %} {% else %} {% trans "Search for a book" as search_placeholder %} {% endif %} diff --git a/bookwyrm/templates/search/author.html b/bookwyrm/templates/search/author.html new file mode 100644 index 000000000..d42c3b54f --- /dev/null +++ b/bookwyrm/templates/search/author.html @@ -0,0 +1,17 @@ +{% extends 'search/layout.html' %} + +{% block panel %} + +{% if results %} + +{% endif %} + +{% endblock %} diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html index 8cf47b371..725a4f43f 100644 --- a/bookwyrm/templates/search/layout.html +++ b/bookwyrm/templates/search/layout.html @@ -20,6 +20,7 @@
    + +
    {% endblock %} From dd1999eb8e75c17b525d301f46242b279ffb93df Mon Sep 17 00:00:00 2001 From: Ross Chapman Date: Tue, 20 Feb 2024 16:25:01 -0800 Subject: [PATCH 076/200] Adds view tests for shelf filters (#3162) * Adds test file * Adds success assertion * Updates tests * Updates shelf books creation * Updates assertion to use isbn for Edition model * Updates query * trigger workflow test * Updates validate_html * Updates comment and test * Fixes none test * Adds management command to clear all deleted user data * Adds success message --------- Co-authored-by: Mouse Reeve Co-authored-by: Mouse Reeve --- bookwyrm/tests/validate_html.py | 28 ++++++++++----- bookwyrm/tests/views/shelf/test_shelf.py | 45 ++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 9 deletions(-) diff --git a/bookwyrm/tests/validate_html.py b/bookwyrm/tests/validate_html.py index 85e5c6277..748b94d5f 100644 --- a/bookwyrm/tests/validate_html.py +++ b/bookwyrm/tests/validate_html.py @@ -13,16 +13,26 @@ def validate_html(html): "warn-proprietary-attributes": False, }, ) - # idk how else to filter out these unescape amp errs + # Tidy's parser is strict when validating unescaped/encoded ampersands found within + # the html document that are notpart of a character or entity reference + # (eg: `&` or `&`). Despite the fact the HTML5 spec no longer recommends + # escaping ampersands in URLs, Tidy will still complain if they are used as query + # param keys. Unfortunately, there is no way currently to configure tidy to ignore + # this so we must explictly redlist related strings that will appear in Tidy's + # errors output. + # + # See further discussion: https://github.com/htacg/tidy-html5/issues/1017 + excluded = [ + "&book", + "&type", + "&resolved", + "id and name attribute", + "illegal characters found in URI", + "escaping malformed URI reference", + "&filter", + ] errors = "\n".join( - e - for e in errors.split("\n") - if "&book" not in e - and "&type" not in e - and "&resolved" not in e - and "id and name attribute" not in e - and "illegal characters found in URI" not in e - and "escaping malformed URI reference" not in e + e for e in errors.split("\n") if not any(exclude in e for exclude in excluded) ) if errors: raise Exception(errors) diff --git a/bookwyrm/tests/views/shelf/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py index 492f214e3..b96d0a9ed 100644 --- a/bookwyrm/tests/views/shelf/test_shelf.py +++ b/bookwyrm/tests/views/shelf/test_shelf.py @@ -219,3 +219,48 @@ class ShelfViews(TestCase): view(request, request.user.username, shelf.identifier) self.assertEqual(shelf.name, "To Read") + + def test_filter_shelf_found(self, *_): + """display books that match a filter keyword""" + models.ShelfBook.objects.create( + book=self.book, + shelf=self.shelf, + user=self.local_user, + ) + shelf_book = models.ShelfBook.objects.create( + book=self.book, + shelf=self.local_user.shelf_set.first(), + user=self.local_user, + ) + view = views.Shelf.as_view() + request = self.factory.get("", {"filter": shelf_book.book.title}) + request.user = self.local_user + with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.local_user.username) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertEqual(result.status_code, 200) + self.assertEqual(len(result.context_data["books"].object_list), 1) + self.assertEqual( + result.context_data["books"].object_list[0].title, + shelf_book.book.title, + ) + + def test_filter_shelf_none(self, *_): + """display a message when no books match a filter keyword""" + models.ShelfBook.objects.create( + book=self.book, + shelf=self.shelf, + user=self.local_user, + ) + view = views.Shelf.as_view() + request = self.factory.get("", {"filter": "NOPE"}) + request.user = self.local_user + with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.local_user.username) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertEqual(result.status_code, 200) + self.assertEqual(len(result.context_data["books"].object_list), 0) From 8f537ef56a11fee392dd6e55688187ad95e6e91f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 20 Feb 2024 16:45:16 -0800 Subject: [PATCH 077/200] Adds missing migration for Korean locale --- .../0195_alter_user_preferred_language.py | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 bookwyrm/migrations/0195_alter_user_preferred_language.py diff --git a/bookwyrm/migrations/0195_alter_user_preferred_language.py b/bookwyrm/migrations/0195_alter_user_preferred_language.py new file mode 100644 index 000000000..1fbfa7304 --- /dev/null +++ b/bookwyrm/migrations/0195_alter_user_preferred_language.py @@ -0,0 +1,46 @@ +# Generated by Django 3.2.23 on 2024-02-21 00:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0194_merge_20240203_1619"), + ] + + operations = [ + migrations.AlterField( + model_name="user", + name="preferred_language", + field=models.CharField( + blank=True, + choices=[ + ("en-us", "English"), + ("ca-es", "Català (Catalan)"), + ("de-de", "Deutsch (German)"), + ("eo-uy", "Esperanto (Esperanto)"), + ("es-es", "EspaÃąol (Spanish)"), + ("eu-es", "Euskara (Basque)"), + ("gl-es", "Galego (Galician)"), + ("it-it", "Italiano (Italian)"), + ("ko-kr", "한ęĩ­ė–´ (Korean)"), + ("fi-fi", "Suomi (Finnish)"), + ("fr-fr", "Français (French)"), + ("lt-lt", "LietuviÅŗ (Lithuanian)"), + ("nl-nl", "Nederlands (Dutch)"), + ("no-no", "Norsk (Norwegian)"), + ("pl-pl", "Polski (Polish)"), + ("pt-br", "PortuguÃĒs do Brasil (Brazilian Portuguese)"), + ("pt-pt", "PortuguÃĒs Europeu (European Portuguese)"), + ("ro-ro", "RomÃĸnă (Romanian)"), + ("sv-se", "Svenska (Swedish)"), + ("uk-ua", "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)"), + ("zh-hans", "įŽ€äŊ“中文 (Simplified Chinese)"), + ("zh-hant", "įšéĢ”中文 (Traditional Chinese)"), + ], + max_length=255, + null=True, + ), + ), + ] From db97d76a240919f31e48b8d97c1c51ca06aadbb4 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Fri, 1 Mar 2024 19:58:11 -0800 Subject: [PATCH 078/200] Add timeout to isbn.py An instance of requests.get in isbn.py lacks a timeout, and this commit adds one with a default of 15 as used other places in the code, where requests.get does already have a timeout. --- bookwyrm/isbn/isbn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/isbn/isbn.py b/bookwyrm/isbn/isbn.py index 56062ff7b..d14dc2619 100644 --- a/bookwyrm/isbn/isbn.py +++ b/bookwyrm/isbn/isbn.py @@ -26,7 +26,7 @@ class IsbnHyphenator: def update_range_message(self) -> None: """Download the range message xml file and save it locally""" - response = requests.get(self.__range_message_url) + response = requests.get(self.__range_message_url, timeout=15) with open(self.__range_file_path, "w", encoding="utf-8") as file: file.write(response.text) self.__element_tree = None From 1ae9870862626134f90b4f1fb86d06fdd870e6c4 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Fri, 1 Mar 2024 20:02:40 -0800 Subject: [PATCH 079/200] Add timeout to base_activity.py An instance of requests.get was missing a timeout; this commit adds a timeout of 15 as used in other places in this codebase which already have timeouts. --- bookwyrm/activitypub/base_activity.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index fbbc18f73..9f1cfdbfb 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -423,6 +423,7 @@ def get_activitypub_data(url): "Date": now, "Signature": make_signature("get", sender, url, now), }, + timeout=15 ) except requests.RequestException: raise ConnectorException() From 50b811d9aa0e117f20851507b385b2020cfcd618 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Fri, 1 Mar 2024 20:11:14 -0800 Subject: [PATCH 080/200] Typo fix Add a comma --- bookwyrm/activitypub/base_activity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 9f1cfdbfb..890d4d24a 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -423,7 +423,7 @@ def get_activitypub_data(url): "Date": now, "Signature": make_signature("get", sender, url, now), }, - timeout=15 + timeout=15, ) except requests.RequestException: raise ConnectorException() From f8fd76cff05450249d59d76f02bc05e2138062dd Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 13:57:09 -0800 Subject: [PATCH 081/200] Remove duplicate types-requests==2.31.0.2 The types-requests==2.31.0.2 dependency was double-listed right next to each other; this commit removes one. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6dc737aab..931bc155b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -54,4 +54,3 @@ types-Pillow==10.0.0.3 types-psycopg2==2.9.21.11 types-python-dateutil==2.8.19.14 types-requests==2.31.0.2 -types-requests==2.31.0.2 From 3652ac81008fd2d0f8d640160de3178913237454 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 15:41:06 -0800 Subject: [PATCH 082/200] Alphabetize requirements.txt Alphabetize requirements.txt for developer convenience; this helps to find duplicates and unnecessarily-pinned subdependencies, as well as making the file easier to read and use. --- requirements.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/requirements.txt b/requirements.txt index 931bc155b..f41210aea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,52 +1,52 @@ aiohttp==3.9.2 bleach==5.0.1 +boto3==1.26.57 +bw-file-resubmit==0.6.0rc2 celery==5.2.7 colorthief==0.2.1 Django==3.2.24 django-celery-beat==2.4.0 -bw-file-resubmit==0.6.0rc2 django-compressor==4.3.1 +django-csp==3.7 django-imagekit==4.1.0 django-model-utils==4.3.1 +django-redis==5.2.0 django-sass-processor==1.2.2 -django-csp==3.7 +django-storages==1.13.2 +django-storages[azure] environs==9.5.0 flower==1.2.0 libsass==0.22.0 Markdown==3.4.1 -Pillow==10.0.1 -psycopg2==2.9.5 -pycryptodome==3.19.1 -python-dateutil==2.8.2 -redis==4.5.4 -requests==2.31.0 -responses==0.22.0 -pytz>=2022.7 -boto3==1.26.57 -django-storages==1.13.2 -django-storages[azure] -django-redis==5.2.0 opentelemetry-api==1.16.0 opentelemetry-exporter-otlp-proto-grpc==1.16.0 opentelemetry-instrumentation-celery==0.37b0 opentelemetry-instrumentation-django==0.37b0 opentelemetry-instrumentation-psycopg2==0.37b0 opentelemetry-sdk==1.16.0 +Pillow==10.0.1 protobuf==3.20.* +psycopg2==2.9.5 +pycryptodome==3.19.1 pyotp==2.8.0 +python-dateutil==2.8.2 +pytz>=2022.7 qrcode==7.3.1 +redis==4.5.4 +requests==2.31.0 +responses==0.22.0 # Dev -pytest-django==4.1.0 +celery-types==0.18.0 +django-stubs[compatible-mypy]==4.2.4 +mypy==1.5.1 +pylint==2.14.0 pytest==6.1.2 pytest-cov==2.10.1 +pytest-django==4.1.0 pytest-env==0.6.2 pytest-xdist==2.3.0 pytidylib==0.3.2 -pylint==2.14.0 -mypy==1.5.1 -celery-types==0.18.0 -django-stubs[compatible-mypy]==4.2.4 types-bleach==6.0.0.4 types-dataclasses==0.6.6 types-Markdown==3.4.2.10 From 570017d3b08a700a7cd12c656a5eeeff059b466b Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 15:57:06 -0800 Subject: [PATCH 083/200] Upgrade Python Version from 3.9 to 3.11 --- .github/workflows/django-tests.yml | 2 +- .github/workflows/mypy.yml | 4 ++-- .github/workflows/pylint.yml | 4 ++-- Dockerfile | 2 +- dev-tools/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 78b6e142e..de71d9bcf 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install Dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 1a641edd2..6df987aa4 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install Dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 3811c97d3..ab8633b48 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install Dependencies run: | python -m pip install --upgrade pip diff --git a/Dockerfile b/Dockerfile index b3cd26e88..82b0c92c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.11 ENV PYTHONUNBUFFERED 1 diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile index 6c132944f..563467f09 100644 --- a/dev-tools/Dockerfile +++ b/dev-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-bookworm +FROM python:3.11-bookworm WORKDIR /app/dev-tools ENV PATH="/app/dev-tools/node_modules/.bin:$PATH" From 39da471f795fd99e40f68e0f48c831f56864208a Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 15:59:17 -0800 Subject: [PATCH 084/200] Disable Pylint Failure for imghdr deprecation for now --- bookwyrm/connectors/abstract_connector.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 8b6dcb885..b61bc2b04 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -3,7 +3,9 @@ from __future__ import annotations from abc import ABC, abstractmethod from typing import Optional, TypedDict, Any, Callable, Union, Iterator from urllib.parse import quote_plus -import imghdr + +# pylint: disable-next=deprecated-module +import imghdr # Deprecated in 3.11 for removal in 3.13; no good alternative yet import logging import re import asyncio From 4312e9bba02df710ca0f11f40fffe00ef7af95b8 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:03:19 -0800 Subject: [PATCH 085/200] Upgrade Celery to 5.3.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f41210aea..0cfa9db9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ aiohttp==3.9.2 bleach==5.0.1 boto3==1.26.57 bw-file-resubmit==0.6.0rc2 -celery==5.2.7 +celery==5.3.1 colorthief==0.2.1 Django==3.2.24 django-celery-beat==2.4.0 From c944824ac7abb6233b43a0f4cc573343635d287e Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:04:06 -0800 Subject: [PATCH 086/200] Upgrade django-celery-beat to 2.5.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0cfa9db9c..19f13307f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ bw-file-resubmit==0.6.0rc2 celery==5.3.1 colorthief==0.2.1 Django==3.2.24 -django-celery-beat==2.4.0 +django-celery-beat==2.5.0 django-compressor==4.3.1 django-csp==3.7 django-imagekit==4.1.0 From fee3fdd5a804a7cb3b234763649034b01b4f5d87 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:04:37 -0800 Subject: [PATCH 087/200] Upgrade django-compressor to 4.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 19f13307f..5882607ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ celery==5.3.1 colorthief==0.2.1 Django==3.2.24 django-celery-beat==2.5.0 -django-compressor==4.3.1 +django-compressor==4.4 django-csp==3.7 django-imagekit==4.1.0 django-model-utils==4.3.1 From c1520da56d0959a5b56f272c2803120aae696425 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:05:11 -0800 Subject: [PATCH 088/200] Upgrade flower to 2.0.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5882607ee..574c7811c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ django-sass-processor==1.2.2 django-storages==1.13.2 django-storages[azure] environs==9.5.0 -flower==1.2.0 +flower==2.0.0 libsass==0.22.0 Markdown==3.4.1 opentelemetry-api==1.16.0 From da2636fa294eec47502666e21dc41e4f71c66b4c Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:07:50 -0800 Subject: [PATCH 089/200] Add grpcio pin @ 1.57.0 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 574c7811c..076456b0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,7 @@ django-storages==1.13.2 django-storages[azure] environs==9.5.0 flower==2.0.0 +grpcio=1.57.0 # Not a direct dependency, pinned to get a security fix libsass==0.22.0 Markdown==3.4.1 opentelemetry-api==1.16.0 From 0f5a3e9163a3f52843b222668dd7a273014db500 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:08:41 -0800 Subject: [PATCH 090/200] Pin Tornado at 6.3.3 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 076456b0d..05c606a83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,6 +36,7 @@ qrcode==7.3.1 redis==4.5.4 requests==2.31.0 responses==0.22.0 +tornado==6.3.3 # Not a direct dependency, pinned to get a security fix # Dev celery-types==0.18.0 From 498dc35d995793a73b3ae358a3d1f2d969240684 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:09:06 -0800 Subject: [PATCH 091/200] Upgrade Pylint to 2.15.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 05c606a83..a2f95c6bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -42,7 +42,7 @@ tornado==6.3.3 # Not a direct dependency, pinned to get a security fix celery-types==0.18.0 django-stubs[compatible-mypy]==4.2.4 mypy==1.5.1 -pylint==2.14.0 +pylint==2.15.0 pytest==6.1.2 pytest-cov==2.10.1 pytest-django==4.1.0 From 22c4155c7c4b850c538ce26a5590d02acc4d706b Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 16:09:34 -0800 Subject: [PATCH 092/200] Upgrade pytest to 6.2.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a2f95c6bc..ae73b1d61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,7 +43,7 @@ celery-types==0.18.0 django-stubs[compatible-mypy]==4.2.4 mypy==1.5.1 pylint==2.15.0 -pytest==6.1.2 +pytest==6.2.5 pytest-cov==2.10.1 pytest-django==4.1.0 pytest-env==0.6.2 From be140d5e5a5818b73c40c7259a54a510681789db Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 17:20:48 -0800 Subject: [PATCH 093/200] Pin setuptools at 65.5.1 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index ae73b1d61..bdf84f7e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,6 +36,7 @@ qrcode==7.3.1 redis==4.5.4 requests==2.31.0 responses==0.22.0 +setuptools>=65.5.1 # Not a direct dependency, pinned to get a security fix tornado==6.3.3 # Not a direct dependency, pinned to get a security fix # Dev From eadb0e640f84f9a69c39638ce425e78fadffb594 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 17:29:42 -0800 Subject: [PATCH 094/200] Fix typo in operator --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bdf84f7e7..c769916a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ django-storages==1.13.2 django-storages[azure] environs==9.5.0 flower==2.0.0 -grpcio=1.57.0 # Not a direct dependency, pinned to get a security fix +grpcio==1.57.0 # Not a direct dependency, pinned to get a security fix libsass==0.22.0 Markdown==3.4.1 opentelemetry-api==1.16.0 From 9fa09d5ebeb96a379f1ba6765aaf22324b8f631d Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 17:30:37 -0800 Subject: [PATCH 095/200] Add extra space required by linter --- bookwyrm/connectors/abstract_connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index b61bc2b04..fbf0fb31b 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -5,7 +5,7 @@ from typing import Optional, TypedDict, Any, Callable, Union, Iterator from urllib.parse import quote_plus # pylint: disable-next=deprecated-module -import imghdr # Deprecated in 3.11 for removal in 3.13; no good alternative yet +import imghdr # Deprecated in 3.11 for removal in 3.13; no good alternative yet import logging import re import asyncio From 91fe4ad535fbe4717042c3189d38d7b4c1336f4a Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 17:31:16 -0800 Subject: [PATCH 096/200] Fix spacing for linter --- bookwyrm/connectors/abstract_connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index fbf0fb31b..aa8edbeae 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -5,7 +5,7 @@ from typing import Optional, TypedDict, Any, Callable, Union, Iterator from urllib.parse import quote_plus # pylint: disable-next=deprecated-module -import imghdr # Deprecated in 3.11 for removal in 3.13; no good alternative yet +import imghdr # Deprecated in 3.11 for removal in 3.13; no good alternative yet import logging import re import asyncio From d138395c75a6790f6ad81a727ad8a3f2c8b1169d Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Sat, 2 Mar 2024 17:43:49 -0800 Subject: [PATCH 097/200] Add linter exclusion for TBookWyrmModel --- bookwyrm/activitypub/base_activity.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 890d4d24a..efc9d8da2 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -20,6 +20,7 @@ from bookwyrm.tasks import app, MISC logger = logging.getLogger(__name__) +# pylint: disable=invalid-name TBookWyrmModel = TypeVar("TBookWyrmModel", bound=base_model.BookWyrmModel) From 09c3d9c0dcdb821de612ac9f47819599bf349dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 3 Mar 2024 18:42:27 -0300 Subject: [PATCH 098/200] json_export: also detect absent "icon" key --- bookwyrm/models/bookwyrm_export_job.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 1f6085e0c..2f32cbd29 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -80,10 +80,7 @@ def json_export( exported_user = user.to_activity() # I don't love this but it prevents a JSON encoding error # when there is no user image - if isinstance( - exported_user["icon"], - dataclasses._MISSING_TYPE, # pylint: disable=protected-access - ): + if exported_user.get("icon") in (None, dataclasses.MISSING): exported_user["icon"] = {} else: # change the URL to be relative to the JSON file From 8d018b872fe33ccdd729a7fb953f65885a45cd47 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 9 Mar 2024 15:39:52 +0100 Subject: [PATCH 099/200] FileLinkForm: fix duplicate check --- bookwyrm/forms/links.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/forms/links.py b/bookwyrm/forms/links.py index d2fd5f116..345c5c1d4 100644 --- a/bookwyrm/forms/links.py +++ b/bookwyrm/forms/links.py @@ -1,4 +1,5 @@ """ using django model forms """ + from urllib.parse import urlparse from django.utils.translation import gettext_lazy as _ @@ -37,10 +38,9 @@ class FileLinkForm(CustomForm): ), ) if ( - not self.instance - and models.FileLink.objects.filter( - url=url, book=book, filetype=filetype - ).exists() + models.FileLink.objects.filter(url=url, book=book, filetype=filetype) + .exclude(pk=self.instance) + .exists() ): # pylint: disable=line-too-long self.add_error( From 3ba528ecddc08bf5f18c8596da2b4fd9f0758291 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 11 Mar 2024 12:46:55 +0100 Subject: [PATCH 100/200] pytest.ini: define ALLOWED_HOSTS This fixes running `./bw-dev pytest` locally when having a different value defined for `ALLOWED_HOSTS` in `.env`. --- pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/pytest.ini b/pytest.ini index b50efd602..18c955032 100644 --- a/pytest.ini +++ b/pytest.ini @@ -11,6 +11,7 @@ env = DEBUG = false USE_HTTPS = true DOMAIN = your.domain.here + ALLOWED_HOSTS = your.domain.here BOOKWYRM_DATABASE_BACKEND = postgres MEDIA_ROOT = images/ CELERY_BROKER = "" From 12b469a0d6a2c554715f53bcf2a333d16dbed8f2 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 13 Mar 2024 12:30:52 +0100 Subject: [PATCH 101/200] CI: use actions/checkout@v4 --- .github/workflows/black.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/curlylint.yaml | 2 +- .github/workflows/django-tests.yml | 2 +- .github/workflows/lint-frontend.yaml | 2 +- .github/workflows/mypy.yml | 2 +- .github/workflows/prettier.yaml | 2 +- .github/workflows/pylint.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 4e7be4af3..7ac208c94 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -10,7 +10,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 - uses: psf/black@22.12.0 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 68bb05d7e..51316ef62 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/curlylint.yaml b/.github/workflows/curlylint.yaml index 8d5c6b4f7..10ad04ce1 100644 --- a/.github/workflows/curlylint.yaml +++ b/.github/workflows/curlylint.yaml @@ -10,7 +10,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install curlylint run: pip install curlylint diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index de71d9bcf..9a2c615a4 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -23,7 +23,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/lint-frontend.yaml b/.github/workflows/lint-frontend.yaml index 0d0559e40..21f11ebf3 100644 --- a/.github/workflows/lint-frontend.yaml +++ b/.github/workflows/lint-frontend.yaml @@ -19,7 +19,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it. - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install modules run: npm install stylelint stylelint-config-recommended stylelint-config-standard stylelint-order eslint diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 6df987aa4..a198efc21 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.11 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/prettier.yaml b/.github/workflows/prettier.yaml index 501516ae1..9c05c7476 100644 --- a/.github/workflows/prettier.yaml +++ b/.github/workflows/prettier.yaml @@ -14,7 +14,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it. - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install modules run: npm install prettier@2.5.1 diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index ab8633b48..85f275020 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.11 uses: actions/setup-python@v4 with: From 6af0a0883827b65e5776c2d1e2f7264600ae7d9f Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 13 Mar 2024 12:35:23 +0100 Subject: [PATCH 102/200] CI: use actions/setup-python@v5 and cache pip --- .github/workflows/black.yml | 2 +- .github/workflows/django-tests.yml | 3 ++- .github/workflows/mypy.yml | 3 ++- .github/workflows/pylint.yml | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 7ac208c94..0633dedb7 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 - uses: psf/black@22.12.0 with: version: 22.12.0 diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 9a2c615a4..7d9cb3cba 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -25,9 +25,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11 + cache: pip - name: Install Dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index a198efc21..d1e3f9fc9 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -14,9 +14,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11 + cache: pip - name: Install Dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 85f275020..915e3154c 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -14,9 +14,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11 + cache: pip - name: Install Dependencies run: | python -m pip install --upgrade pip From 74fdd9a85a8741ea5ac71432ebaffd6b800f8d23 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 13 Mar 2024 10:31:09 +0100 Subject: [PATCH 103/200] CI: simplify pytest setup --- .github/workflows/django-tests.yml | 52 +++++++++--------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 7d9cb3cba..da237592f 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -7,12 +7,20 @@ on: jobs: build: - - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest + env: # overrides for .env.example + POSTGRES_HOST: 127.0.0.1 + PGPORT: 5432 + POSTGRES_USER: postgres + POSTGRES_PASSWORD: hunter2 + POSTGRES_DB: github_actions + SECRET_KEY: beepbeep + EMAIL_HOST_USER: "" + EMAIL_HOST_PASSWORD: "" services: postgres: image: postgres:13 - env: + env: # does not inherit from jobs.build.env POSTGRES_USER: postgres POSTGRES_PASSWORD: hunter2 options: >- @@ -33,39 +41,9 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt + - name: Set up .env + run: cp .env.example .env - name: Check migrations up-to-date - run: | - python ./manage.py makemigrations --check - env: - SECRET_KEY: beepbeep - DOMAIN: your.domain.here - EMAIL_HOST: "" - EMAIL_HOST_USER: "" - EMAIL_HOST_PASSWORD: "" + run: python ./manage.py makemigrations --check - name: Run Tests - env: - SECRET_KEY: beepbeep - DEBUG: false - USE_HTTPS: true - DOMAIN: your.domain.here - BOOKWYRM_DATABASE_BACKEND: postgres - MEDIA_ROOT: images/ - POSTGRES_PASSWORD: hunter2 - POSTGRES_USER: postgres - POSTGRES_DB: github_actions - POSTGRES_HOST: 127.0.0.1 - CELERY_BROKER: "" - REDIS_BROKER_PORT: 6379 - REDIS_BROKER_PASSWORD: beep - USE_DUMMY_CACHE: true - 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 - ENABLE_THUMBNAIL_GENERATION: true - HTTP_X_FORWARDED_PROTO: false - run: | - pytest -n 3 + run: pytest -n 3 From 383e6533e11da5c88ceebb9cfad89d6980f7d430 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 13 Mar 2024 11:56:16 +0100 Subject: [PATCH 104/200] CI: use pytest-github-actions-annotate-failures --- .github/workflows/django-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index da237592f..ce9b2b7b1 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -41,6 +41,7 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt + pip install pytest-github-actions-annotate-failures - name: Set up .env run: cp .env.example .env - name: Check migrations up-to-date From 4e20e430379a820c1e4f88590bf6afe08cba8249 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 13 Mar 2024 12:48:02 +0100 Subject: [PATCH 105/200] CI: merge all Python actions into one file --- .github/workflows/black.yml | 17 ----- .github/workflows/django-tests.yml | 50 --------------- .github/workflows/mypy.yml | 51 --------------- .github/workflows/pylint.yml | 28 --------- .github/workflows/python.yml | 99 ++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 146 deletions(-) delete mode 100644 .github/workflows/black.yml delete mode 100644 .github/workflows/django-tests.yml delete mode 100644 .github/workflows/mypy.yml delete mode 100644 .github/workflows/pylint.yml create mode 100644 .github/workflows/python.yml diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml deleted file mode 100644 index 0633dedb7..000000000 --- a/.github/workflows/black.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Python Formatting (run ./bw-dev black to fix) - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - - uses: psf/black@22.12.0 - with: - version: 22.12.0 diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml deleted file mode 100644 index ce9b2b7b1..000000000 --- a/.github/workflows/django-tests.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Run Python Tests -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - runs-on: ubuntu-latest - env: # overrides for .env.example - POSTGRES_HOST: 127.0.0.1 - PGPORT: 5432 - POSTGRES_USER: postgres - POSTGRES_PASSWORD: hunter2 - POSTGRES_DB: github_actions - SECRET_KEY: beepbeep - EMAIL_HOST_USER: "" - EMAIL_HOST_PASSWORD: "" - services: - postgres: - image: postgres:13 - env: # does not inherit from jobs.build.env - POSTGRES_USER: postgres - POSTGRES_PASSWORD: hunter2 - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - - 5432:5432 - steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3.11 - cache: pip - - name: Install Dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install pytest-github-actions-annotate-failures - - name: Set up .env - run: cp .env.example .env - - name: Check migrations up-to-date - run: python ./manage.py makemigrations --check - - name: Run Tests - run: pytest -n 3 diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml deleted file mode 100644 index d1e3f9fc9..000000000 --- a/.github/workflows/mypy.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Mypy - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: 3.11 - cache: pip - - name: Install Dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Analysing the code with mypy - env: - SECRET_KEY: beepbeep - DEBUG: false - USE_HTTPS: true - DOMAIN: your.domain.here - BOOKWYRM_DATABASE_BACKEND: postgres - MEDIA_ROOT: images/ - POSTGRES_PASSWORD: hunter2 - POSTGRES_USER: postgres - POSTGRES_DB: github_actions - POSTGRES_HOST: 127.0.0.1 - CELERY_BROKER: "" - REDIS_BROKER_PORT: 6379 - REDIS_BROKER_PASSWORD: beep - USE_DUMMY_CACHE: true - 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 - ENABLE_THUMBNAIL_GENERATION: true - HTTP_X_FORWARDED_PROTO: false - run: | - mypy bookwyrm celerywyrm diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml deleted file mode 100644 index 915e3154c..000000000 --- a/.github/workflows/pylint.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Pylint - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: 3.11 - cache: pip - - name: Install Dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Analysing the code with pylint - run: | - pylint bookwyrm/ - diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml new file mode 100644 index 000000000..dcbe05aee --- /dev/null +++ b/.github/workflows/python.yml @@ -0,0 +1,99 @@ +name: Python +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +# overrides for .env.example +env: + POSTGRES_HOST: 127.0.0.1 + PGPORT: 5432 + POSTGRES_USER: postgres + POSTGRES_PASSWORD: hunter2 + POSTGRES_DB: github_actions + SECRET_KEY: beepbeep + EMAIL_HOST_USER: "" + EMAIL_HOST_PASSWORD: "" + +jobs: + pytest: + name: Tests (pytest) + runs-on: ubuntu-latest + services: + postgres: + image: postgres:13 + env: # does not inherit from jobs.build.env + POSTGRES_USER: postgres + POSTGRES_PASSWORD: hunter2 + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + - 5432:5432 + steps: + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: 3.11 + cache: pip + - name: Install Dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pytest-github-actions-annotate-failures + - name: Set up .env + run: cp .env.example .env + - name: Check migrations up-to-date + run: python ./manage.py makemigrations --check + - name: Run Tests + run: pytest -n 3 + + pylint: + name: Linting (pylint) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: 3.11 + cache: pip + - name: Install Dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Analyse code with pylint + run: pylint bookwyrm/ + + mypy: + name: Typing (mypy) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: 3.11 + cache: pip + - name: Install Dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Set up .env + run: cp .env.example .env + - name: Analyse code with mypy + run: mypy bookwyrm celerywyrm + + black: + name: Formatting (black; run ./bw-dev black to fix) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - uses: psf/black@22.12.0 + with: + version: 22.12.0 From 1b9e0546e64dd0306c3389034fa0df8127d22e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 17 Mar 2024 19:46:30 -0300 Subject: [PATCH 106/200] Bracket-wrap calls to `patch()` for better readability --- .../tests/activitypub/test_base_activity.py | 8 +- bookwyrm/tests/activitypub/test_note.py | 8 +- .../activitystreams/test_abstractstream.py | 16 ++- .../tests/activitystreams/test_booksstream.py | 8 +- .../tests/activitystreams/test_homestream.py | 8 +- .../tests/activitystreams/test_localstream.py | 8 +- .../tests/activitystreams/test_signals.py | 8 +- bookwyrm/tests/activitystreams/test_tasks.py | 8 +- .../connectors/test_inventaire_connector.py | 13 ++- .../tests/importers/test_calibre_import.py | 8 +- .../tests/importers/test_goodreads_import.py | 8 +- bookwyrm/tests/importers/test_importer.py | 8 +- .../importers/test_librarything_import.py | 8 +- .../importers/test_openlibrary_import.py | 8 +- .../tests/importers/test_storygraph_import.py | 8 +- bookwyrm/tests/lists_stream/test_signals.py | 8 +- bookwyrm/tests/lists_stream/test_stream.py | 8 +- bookwyrm/tests/lists_stream/test_tasks.py | 15 ++- .../management/test_populate_lists_streams.py | 8 +- .../tests/management/test_populate_streams.py | 17 +-- .../tests/models/test_activitypub_mixin.py | 8 +- bookwyrm/tests/models/test_automod.py | 8 +- bookwyrm/tests/models/test_base_model.py | 8 +- .../tests/models/test_bookwyrm_export_job.py | 18 ++- .../tests/models/test_bookwyrm_import_job.py | 110 +++++++++++------- bookwyrm/tests/models/test_group.py | 22 ++-- bookwyrm/tests/models/test_import_model.py | 8 +- bookwyrm/tests/models/test_list.py | 8 +- bookwyrm/tests/models/test_notification.py | 24 ++-- .../tests/models/test_readthrough_model.py | 8 +- .../tests/models/test_relationship_models.py | 8 +- bookwyrm/tests/models/test_shelf_model.py | 8 +- bookwyrm/tests/models/test_site.py | 8 +- bookwyrm/tests/models/test_status_model.py | 8 +- bookwyrm/tests/models/test_user_model.py | 37 +++--- .../templatetags/test_book_display_tags.py | 8 +- .../tests/templatetags/test_feed_page_tags.py | 8 +- .../tests/templatetags/test_interaction.py | 8 +- .../test_notification_page_tags.py | 8 +- .../tests/templatetags/test_rating_tags.py | 8 +- .../tests/templatetags/test_shelf_tags.py | 8 +- .../tests/templatetags/test_status_display.py | 8 +- bookwyrm/tests/templatetags/test_utilities.py | 8 +- bookwyrm/tests/test_context_processors.py | 8 +- bookwyrm/tests/test_emailing.py | 8 +- bookwyrm/tests/test_preview_images.py | 24 ++-- bookwyrm/tests/test_signing.py | 8 +- bookwyrm/tests/test_suggested_users.py | 8 +- .../tests/views/admin/test_announcements.py | 8 +- bookwyrm/tests/views/admin/test_automod.py | 8 +- bookwyrm/tests/views/admin/test_celery.py | 8 +- bookwyrm/tests/views/admin/test_dashboard.py | 8 +- .../tests/views/admin/test_email_blocks.py | 8 +- .../tests/views/admin/test_email_config.py | 8 +- bookwyrm/tests/views/admin/test_federation.py | 8 +- bookwyrm/tests/views/admin/test_imports.py | 8 +- .../tests/views/admin/test_ip_blocklist.py | 8 +- .../tests/views/admin/test_link_domains.py | 8 +- bookwyrm/tests/views/admin/test_reports.py | 8 +- bookwyrm/tests/views/admin/test_site.py | 8 +- bookwyrm/tests/views/admin/test_themes.py | 8 +- bookwyrm/tests/views/admin/test_user_admin.py | 8 +- bookwyrm/tests/views/books/test_book.py | 8 +- bookwyrm/tests/views/books/test_edit_book.py | 8 +- bookwyrm/tests/views/books/test_editions.py | 8 +- bookwyrm/tests/views/books/test_links.py | 5 +- bookwyrm/tests/views/imports/test_import.py | 8 +- .../tests/views/imports/test_import_review.py | 8 +- .../views/imports/test_import_troubleshoot.py | 8 +- .../tests/views/imports/test_user_import.py | 8 +- bookwyrm/tests/views/inbox/test_inbox.py | 8 +- bookwyrm/tests/views/inbox/test_inbox_add.py | 8 +- .../tests/views/inbox/test_inbox_announce.py | 8 +- .../tests/views/inbox/test_inbox_block.py | 17 ++- .../tests/views/inbox/test_inbox_create.py | 16 ++- .../tests/views/inbox/test_inbox_delete.py | 8 +- .../tests/views/inbox/test_inbox_follow.py | 8 +- bookwyrm/tests/views/inbox/test_inbox_like.py | 8 +- .../tests/views/inbox/test_inbox_remove.py | 15 ++- .../tests/views/inbox/test_inbox_update.py | 15 ++- bookwyrm/tests/views/landing/test_invite.py | 8 +- bookwyrm/tests/views/landing/test_landing.py | 8 +- bookwyrm/tests/views/landing/test_login.py | 8 +- bookwyrm/tests/views/landing/test_password.py | 8 +- bookwyrm/tests/views/landing/test_register.py | 8 +- bookwyrm/tests/views/lists/test_curate.py | 15 ++- bookwyrm/tests/views/lists/test_embed.py | 15 ++- bookwyrm/tests/views/lists/test_list.py | 33 ++++-- bookwyrm/tests/views/lists/test_list_item.py | 15 ++- bookwyrm/tests/views/lists/test_lists.py | 46 +++++--- .../tests/views/preferences/test_block.py | 18 +-- .../views/preferences/test_change_password.py | 8 +- .../views/preferences/test_delete_user.py | 15 ++- .../tests/views/preferences/test_edit_user.py | 15 ++- .../tests/views/preferences/test_export.py | 5 +- .../views/preferences/test_export_user.py | 5 +- .../views/preferences/test_two_factor_auth.py | 13 ++- bookwyrm/tests/views/shelf/test_shelf.py | 8 +- .../tests/views/shelf/test_shelf_actions.py | 8 +- bookwyrm/tests/views/test_annual_summary.py | 8 +- bookwyrm/tests/views/test_author.py | 8 +- bookwyrm/tests/views/test_directory.py | 8 +- bookwyrm/tests/views/test_discover.py | 8 +- bookwyrm/tests/views/test_feed.py | 8 +- bookwyrm/tests/views/test_follow.py | 24 ++-- bookwyrm/tests/views/test_get_started.py | 8 +- bookwyrm/tests/views/test_goal.py | 8 +- bookwyrm/tests/views/test_group.py | 8 +- bookwyrm/tests/views/test_hashtag.py | 36 +++--- bookwyrm/tests/views/test_helpers.py | 8 +- bookwyrm/tests/views/test_interaction.py | 8 +- bookwyrm/tests/views/test_isbn.py | 8 +- bookwyrm/tests/views/test_notifications.py | 15 ++- bookwyrm/tests/views/test_outbox.py | 8 +- bookwyrm/tests/views/test_reading.py | 8 +- bookwyrm/tests/views/test_readthrough.py | 8 +- bookwyrm/tests/views/test_report.py | 15 ++- bookwyrm/tests/views/test_rss_feed.py | 8 +- bookwyrm/tests/views/test_search.py | 15 ++- bookwyrm/tests/views/test_status.py | 16 ++- bookwyrm/tests/views/test_updates.py | 34 +++--- bookwyrm/tests/views/test_user.py | 16 +-- bookwyrm/tests/views/test_wellknown.py | 8 +- 123 files changed, 883 insertions(+), 559 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index a0d10019f..8f2cd7fb2 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -31,9 +31,11 @@ class BaseActivity(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we're probably going to re-use this so why copy/paste""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/activitypub/test_note.py b/bookwyrm/tests/activitypub/test_note.py index fd5467f01..65502c70a 100644 --- a/bookwyrm/tests/activitypub/test_note.py +++ b/bookwyrm/tests/activitypub/test_note.py @@ -13,9 +13,11 @@ class Note(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create a shared user""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/activitystreams/test_abstractstream.py b/bookwyrm/tests/activitystreams/test_abstractstream.py index 83985efdc..acdd5529c 100644 --- a/bookwyrm/tests/activitystreams/test_abstractstream.py +++ b/bookwyrm/tests/activitystreams/test_abstractstream.py @@ -18,9 +18,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """use a test csv""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) @@ -105,9 +107,11 @@ class Activitystreams(TestCase): privacy="direct", book=self.book, ) - with patch("bookwyrm.activitystreams.r.set"), patch( - "bookwyrm.activitystreams.r.delete" - ), patch("bookwyrm.activitystreams.ActivityStream.get_store") as redis_mock: + with ( + patch("bookwyrm.activitystreams.r.set"), + patch("bookwyrm.activitystreams.r.delete"), + patch("bookwyrm.activitystreams.ActivityStream.get_store") as redis_mock, + ): redis_mock.return_value = [status.id, status2.id] result = self.test_stream.get_activity_stream(self.local_user) self.assertEqual(result.count(), 2) diff --git a/bookwyrm/tests/activitystreams/test_booksstream.py b/bookwyrm/tests/activitystreams/test_booksstream.py index 71d7ce531..eb61cc203 100644 --- a/bookwyrm/tests/activitystreams/test_booksstream.py +++ b/bookwyrm/tests/activitystreams/test_booksstream.py @@ -17,9 +17,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """use a test csv""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/activitystreams/test_homestream.py b/bookwyrm/tests/activitystreams/test_homestream.py index 3312f20ee..0baf1d1b8 100644 --- a/bookwyrm/tests/activitystreams/test_homestream.py +++ b/bookwyrm/tests/activitystreams/test_homestream.py @@ -15,9 +15,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """use a test csv""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/activitystreams/test_localstream.py b/bookwyrm/tests/activitystreams/test_localstream.py index f4ca13395..92ec2b069 100644 --- a/bookwyrm/tests/activitystreams/test_localstream.py +++ b/bookwyrm/tests/activitystreams/test_localstream.py @@ -15,9 +15,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """use a test csv""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/activitystreams/test_signals.py b/bookwyrm/tests/activitystreams/test_signals.py index db16a0081..b9fb75ade 100644 --- a/bookwyrm/tests/activitystreams/test_signals.py +++ b/bookwyrm/tests/activitystreams/test_signals.py @@ -17,9 +17,11 @@ class ActivitystreamsSignals(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """use a test csv""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/activitystreams/test_tasks.py b/bookwyrm/tests/activitystreams/test_tasks.py index 39a240e92..cf2ee40e6 100644 --- a/bookwyrm/tests/activitystreams/test_tasks.py +++ b/bookwyrm/tests/activitystreams/test_tasks.py @@ -10,9 +10,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """use a test csv""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index c4ea1a595..874d64862 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -212,11 +212,14 @@ class Inventaire(TestCase): json={"entities": {}}, ) data = {"uri": "blah"} - with patch( - "bookwyrm.connectors.inventaire.Connector.load_edition_data" - ) as loader_mock, patch( - "bookwyrm.connectors.inventaire.Connector.get_book_data" - ) as getter_mock: + with ( + patch( + "bookwyrm.connectors.inventaire.Connector.load_edition_data" + ) as loader_mock, + patch( + "bookwyrm.connectors.inventaire.Connector.get_book_data" + ) as getter_mock, + ): loader_mock.return_value = {"uris": ["hello"]} self.connector.get_edition_from_work_data(data) self.assertTrue(getter_mock.called) diff --git a/bookwyrm/tests/importers/test_calibre_import.py b/bookwyrm/tests/importers/test_calibre_import.py index d549a75ed..6bfa754af 100644 --- a/bookwyrm/tests/importers/test_calibre_import.py +++ b/bookwyrm/tests/importers/test_calibre_import.py @@ -25,9 +25,11 @@ class CalibreImport(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """populate database""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index 0b5fd5e2d..deb41a1df 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -32,9 +32,11 @@ class GoodreadsImport(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """populate database""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index eb3041dc6..494d28ad0 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -35,9 +35,11 @@ class GenericImporter(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """populate database""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index c2fe7a9a8..ba86721de 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -34,9 +34,11 @@ class LibrarythingImport(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """populate database""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mmai", "mmai@mmai.mmai", "password", local=True ) diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index 2712930d9..e0e6135c9 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -32,9 +32,11 @@ class OpenLibraryImport(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """populate database""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) diff --git a/bookwyrm/tests/importers/test_storygraph_import.py b/bookwyrm/tests/importers/test_storygraph_import.py index edc484629..180cd8ad4 100644 --- a/bookwyrm/tests/importers/test_storygraph_import.py +++ b/bookwyrm/tests/importers/test_storygraph_import.py @@ -32,9 +32,11 @@ class StorygraphImport(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """populate database""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) diff --git a/bookwyrm/tests/lists_stream/test_signals.py b/bookwyrm/tests/lists_stream/test_signals.py index 51f0709b0..923d19a2f 100644 --- a/bookwyrm/tests/lists_stream/test_signals.py +++ b/bookwyrm/tests/lists_stream/test_signals.py @@ -11,9 +11,11 @@ class ListsStreamSignals(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """database setup""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/lists_stream/test_stream.py b/bookwyrm/tests/lists_stream/test_stream.py index 6dd6a1c8e..fcac04d19 100644 --- a/bookwyrm/tests/lists_stream/test_stream.py +++ b/bookwyrm/tests/lists_stream/test_stream.py @@ -18,9 +18,11 @@ class ListsStream(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """database setup""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/lists_stream/test_tasks.py b/bookwyrm/tests/lists_stream/test_tasks.py index 18ddecf18..fe3cb319d 100644 --- a/bookwyrm/tests/lists_stream/test_tasks.py +++ b/bookwyrm/tests/lists_stream/test_tasks.py @@ -13,9 +13,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """database setup""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) @@ -36,9 +38,10 @@ class Activitystreams(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): self.list = models.List.objects.create( user=self.local_user, name="hi", privacy="public" ) diff --git a/bookwyrm/tests/management/test_populate_lists_streams.py b/bookwyrm/tests/management/test_populate_lists_streams.py index 5990da4e3..f098c2b11 100644 --- a/bookwyrm/tests/management/test_populate_lists_streams.py +++ b/bookwyrm/tests/management/test_populate_lists_streams.py @@ -15,9 +15,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need some stuff""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index 4d6bf688f..034222b29 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -13,9 +13,11 @@ class Activitystreams(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need some stuff""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) @@ -53,11 +55,10 @@ class Activitystreams(TestCase): user=self.local_user, content="hi", book=self.book ) - with patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ) as redis_mock, patch( - "bookwyrm.lists_stream.populate_lists_task.delay" - ) as list_mock: + with ( + patch("bookwyrm.activitystreams.populate_stream_task.delay") as redis_mock, + patch("bookwyrm.lists_stream.populate_lists_task.delay") as list_mock, + ): populate_streams() self.assertEqual(redis_mock.call_count, 6) # 2 users x 3 streams self.assertEqual(list_mock.call_count, 2) # 2 users diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 2f6fad76d..b59088f91 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -29,9 +29,11 @@ class ActivitypubMixins(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """shared data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_automod.py b/bookwyrm/tests/models/test_automod.py index 1ad139886..ed3133cdc 100644 --- a/bookwyrm/tests/models/test_automod.py +++ b/bookwyrm/tests/models/test_automod.py @@ -17,9 +17,11 @@ class AutomodModel(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index f1f465b73..d0e441cef 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -15,9 +15,11 @@ class BaseModel(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """shared data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index b5f2520a9..be6bda3cc 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -16,16 +16,14 @@ class BookwyrmExport(TestCase): def setUp(self): """lots of stuff to set up for a user export""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"), patch( - "bookwyrm.suggested_users.rerank_user_task.delay" - ), patch( - "bookwyrm.lists_stream.remove_list_task.delay" - ), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch( - "bookwyrm.activitystreams.add_book_statuses_task" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + patch("bookwyrm.suggested_users.rerank_user_task.delay"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_book_statuses_task"), ): self.local_user = models.User.objects.create_user( diff --git a/bookwyrm/tests/models/test_bookwyrm_import_job.py b/bookwyrm/tests/models/test_bookwyrm_import_job.py index adc04706c..50c136f21 100644 --- a/bookwyrm/tests/models/test_bookwyrm_import_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_import_job.py @@ -18,10 +18,11 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods def setUp(self): """setting stuff up""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"), patch( - "bookwyrm.suggested_users.rerank_user_task.delay" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + patch("bookwyrm.suggested_users.rerank_user_task.delay"), ): self.local_user = models.User.objects.create_user( @@ -78,9 +79,11 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods def test_update_user_profile(self): """Test update the user's profile from import data""" - with patch("bookwyrm.suggested_users.remove_user_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.suggested_users.rerank_user_task.delay"): + with ( + patch("bookwyrm.suggested_users.remove_user_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.suggested_users.rerank_user_task.delay"), + ): with open(self.archive_file, "rb") as fileobj: with BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile: @@ -103,9 +106,11 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods def test_update_user_settings(self): """Test updating the user's settings from import data""" - with patch("bookwyrm.suggested_users.remove_user_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.suggested_users.rerank_user_task.delay"): + with ( + patch("bookwyrm.suggested_users.remove_user_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.suggested_users.rerank_user_task.delay"), + ): models.bookwyrm_import_job.update_user_settings( self.local_user, self.json_data @@ -145,8 +150,9 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods def test_upsert_saved_lists_existing(self): """Test upserting an existing saved list""" - with patch("bookwyrm.lists_stream.remove_list_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.lists_stream.remove_list_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): book_list = models.List.objects.create( name="My cool list", @@ -172,8 +178,9 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods def test_upsert_saved_lists_not_existing(self): """Test upserting a new saved list""" - with patch("bookwyrm.lists_stream.remove_list_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.lists_stream.remove_list_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): book_list = models.List.objects.create( name="My cool list", @@ -199,9 +206,11 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods self.assertFalse(before_follow) - with patch("bookwyrm.activitystreams.add_user_statuses_task.delay"), patch( - "bookwyrm.lists_stream.add_user_lists_task.delay" - ), patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + with ( + patch("bookwyrm.activitystreams.add_user_statuses_task.delay"), + patch("bookwyrm.lists_stream.add_user_lists_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + ): models.bookwyrm_import_job.upsert_follows( self.local_user, self.json_data.get("follows") ) @@ -222,10 +231,11 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods ).exists() self.assertFalse(blocked_before) - with patch("bookwyrm.suggested_users.remove_suggestion_task.delay"), patch( - "bookwyrm.activitystreams.remove_user_statuses_task.delay" - ), patch("bookwyrm.lists_stream.remove_user_lists_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.suggested_users.remove_suggestion_task.delay"), + patch("bookwyrm.activitystreams.remove_user_statuses_task.delay"), + patch("bookwyrm.lists_stream.remove_user_lists_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): models.bookwyrm_import_job.upsert_user_blocks( self.local_user, self.json_data.get("blocks") @@ -312,9 +322,10 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods self.assertEqual(models.Review.objects.filter(user=self.local_user).count(), 0) reviews = self.json_data["books"][0]["reviews"] - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True), + ): bookwyrm_import_job.upsert_statuses( self.local_user, models.Review, reviews, self.book.remote_id @@ -349,9 +360,10 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods self.assertEqual(models.Comment.objects.filter(user=self.local_user).count(), 0) comments = self.json_data["books"][1]["comments"] - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True), + ): bookwyrm_import_job.upsert_statuses( self.local_user, models.Comment, comments, self.book.remote_id @@ -378,9 +390,10 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods models.Quotation.objects.filter(user=self.local_user).count(), 0 ) quotes = self.json_data["books"][1]["quotations"] - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True), + ): bookwyrm_import_job.upsert_statuses( self.local_user, models.Quotation, quotes, self.book.remote_id @@ -411,9 +424,10 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods models.Quotation.objects.filter(user=self.local_user).count(), 0 ) quotes = self.json_data["books"][1]["quotations"] - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=False): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=False), + ): bookwyrm_import_job.upsert_statuses( self.local_user, models.Quotation, quotes, self.book.remote_id @@ -432,8 +446,9 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods title="Another Book", remote_id="https://example.com/book/9876" ) - with patch("bookwyrm.lists_stream.remove_list_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.lists_stream.remove_list_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): book_list = models.List.objects.create( name="my list of books", user=self.local_user @@ -452,8 +467,9 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods 1, ) - with patch("bookwyrm.lists_stream.remove_list_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.lists_stream.remove_list_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): bookwyrm_import_job.upsert_lists( self.local_user, @@ -479,8 +495,9 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods self.assertEqual(models.List.objects.filter(user=self.local_user).count(), 0) self.assertFalse(models.ListItem.objects.filter(book=self.book.id).exists()) - with patch("bookwyrm.lists_stream.remove_list_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.lists_stream.remove_list_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): bookwyrm_import_job.upsert_lists( self.local_user, @@ -503,16 +520,18 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods shelf = models.Shelf.objects.get(name="Read", user=self.local_user) - with patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): models.ShelfBook.objects.create( book=self.book, shelf=shelf, user=self.local_user ) book_data = self.json_data["books"][0] - with patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): bookwyrm_import_job.upsert_shelves(self.book, self.local_user, book_data) @@ -530,8 +549,9 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods book_data = self.json_data["books"][0] - with patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + with ( + patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), ): bookwyrm_import_job.upsert_shelves(self.book, self.local_user, book_data) diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py index 6f5388b19..3ea424333 100644 --- a/bookwyrm/tests/models/test_group.py +++ b/bookwyrm/tests/models/test_group.py @@ -13,9 +13,11 @@ class Group(TestCase): def setUpTestData(self): # pylint: disable=bad-classmethod-argument """Set up for tests""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.owner_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) @@ -81,9 +83,10 @@ class Group(TestCase): """follower-only group booklists should not be excluded from group booklist listing for group members who do not follower list owner""" - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): followers_list = models.List.objects.create( name="Followers List", curation="group", @@ -104,9 +107,10 @@ class Group(TestCase): """private group booklists should not be excluded from group booklist listing for group members""" - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): private_list = models.List.objects.create( name="Private List", privacy="direct", diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 7ca36d223..e5be01464 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -19,9 +19,11 @@ class ImportJob(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """data is from a goodreads export of The Raven Tower""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index 83d7ed6a5..b1b756cab 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -14,9 +14,11 @@ class List(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """look, a list""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_notification.py b/bookwyrm/tests/models/test_notification.py index 93422640b..a9ed8b661 100644 --- a/bookwyrm/tests/models/test_notification.py +++ b/bookwyrm/tests/models/test_notification.py @@ -10,9 +10,11 @@ class Notification(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """useful things for creating a notification""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) @@ -201,9 +203,11 @@ class NotifyInviteRequest(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """ensure there is one admin""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -264,9 +268,11 @@ class NotifyInviteRequest(TestCase): def test_notify_multiple_admins(self): """all admins are notified""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "admin@local.com", "admin@example.com", diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index d34a06aaf..0da87f67b 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -14,9 +14,11 @@ class ReadThrough(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """look, a shelf""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index 8f849bc3b..dbb0ac8bb 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -27,9 +27,11 @@ class Relationship(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index 88b1fad06..2d45dadbc 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -18,9 +18,11 @@ class Shelf(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """look, a shelf""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_site.py b/bookwyrm/tests/models/test_site.py index f4accc04b..8cf15ad6f 100644 --- a/bookwyrm/tests/models/test_site.py +++ b/bookwyrm/tests/models/test_site.py @@ -15,9 +15,11 @@ class SiteModels(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 9899f6bf3..32ccc2c57 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -27,9 +27,11 @@ class Status(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """useful things for creating a status""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 47a662e49..a47896269 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -20,9 +20,11 @@ class User(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( f"mouse@{DOMAIN}", "mouse@mouse.mouse", @@ -122,9 +124,11 @@ class User(TestCase): site.default_user_auth_group = Group.objects.get(name="editor") site.save() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): user = models.User.objects.create_user( f"test2{DOMAIN}", "test2@bookwyrm.test", @@ -135,9 +139,11 @@ class User(TestCase): site.default_user_auth_group = None site.save() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): user = models.User.objects.create_user( f"test1{DOMAIN}", "test1@bookwyrm.test", @@ -228,11 +234,14 @@ class User(TestCase): self.assertEqual(self.user.name, "hi") self.assertEqual(self.user.summary, "a summary") self.assertEqual(self.user.email, "mouse@mouse.mouse") - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ) as broadcast_mock, patch( - "bookwyrm.models.user.User.erase_user_statuses" - ) as erase_statuses_mock: + with ( + patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + ) as broadcast_mock, + patch( + "bookwyrm.models.user.User.erase_user_statuses" + ) as erase_statuses_mock, + ): self.user.delete() self.assertEqual(erase_statuses_mock.call_count, 1) diff --git a/bookwyrm/tests/templatetags/test_book_display_tags.py b/bookwyrm/tests/templatetags/test_book_display_tags.py index dcff01a80..77d6fee54 100644 --- a/bookwyrm/tests/templatetags/test_book_display_tags.py +++ b/bookwyrm/tests/templatetags/test_book_display_tags.py @@ -16,9 +16,11 @@ class BookDisplayTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/templatetags/test_feed_page_tags.py b/bookwyrm/tests/templatetags/test_feed_page_tags.py index d0a895f36..891bfc32c 100644 --- a/bookwyrm/tests/templatetags/test_feed_page_tags.py +++ b/bookwyrm/tests/templatetags/test_feed_page_tags.py @@ -15,9 +15,11 @@ class FeedPageTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/templatetags/test_interaction.py b/bookwyrm/tests/templatetags/test_interaction.py index a9d1267c0..bd66575ff 100644 --- a/bookwyrm/tests/templatetags/test_interaction.py +++ b/bookwyrm/tests/templatetags/test_interaction.py @@ -15,9 +15,11 @@ class InteractionTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/templatetags/test_notification_page_tags.py b/bookwyrm/tests/templatetags/test_notification_page_tags.py index 94f839ec5..df2805828 100644 --- a/bookwyrm/tests/templatetags/test_notification_page_tags.py +++ b/bookwyrm/tests/templatetags/test_notification_page_tags.py @@ -15,9 +15,11 @@ class NotificationPageTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/templatetags/test_rating_tags.py b/bookwyrm/tests/templatetags/test_rating_tags.py index 5225d57a6..f50236262 100644 --- a/bookwyrm/tests/templatetags/test_rating_tags.py +++ b/bookwyrm/tests/templatetags/test_rating_tags.py @@ -15,9 +15,11 @@ class RatingTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/templatetags/test_shelf_tags.py b/bookwyrm/tests/templatetags/test_shelf_tags.py index 7c456c815..47e86d9ef 100644 --- a/bookwyrm/tests/templatetags/test_shelf_tags.py +++ b/bookwyrm/tests/templatetags/test_shelf_tags.py @@ -18,9 +18,11 @@ class ShelfTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/templatetags/test_status_display.py b/bookwyrm/tests/templatetags/test_status_display.py index a9bab0b68..af125fd06 100644 --- a/bookwyrm/tests/templatetags/test_status_display.py +++ b/bookwyrm/tests/templatetags/test_status_display.py @@ -17,9 +17,11 @@ class StatusDisplayTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/templatetags/test_utilities.py b/bookwyrm/tests/templatetags/test_utilities.py index 1bf98fda8..6fade22a7 100644 --- a/bookwyrm/tests/templatetags/test_utilities.py +++ b/bookwyrm/tests/templatetags/test_utilities.py @@ -17,9 +17,11 @@ class UtilitiesTags(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create some filler objects""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/test_context_processors.py b/bookwyrm/tests/test_context_processors.py index 614db681c..e5290f312 100644 --- a/bookwyrm/tests/test_context_processors.py +++ b/bookwyrm/tests/test_context_processors.py @@ -14,9 +14,11 @@ class ContextProcessor(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index 119941e85..8a5b543d5 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -14,9 +14,11 @@ class Emailing(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index d1998bf3c..4f711b38b 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -31,9 +31,11 @@ class PreviewImages(TestCase): avatar_file = pathlib.Path(__file__).parent.joinpath( "../static/images/no_cover.jpg" ) - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "possum@local.com", "possum@possum.possum", @@ -47,9 +49,11 @@ class PreviewImages(TestCase): ), ) - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", @@ -60,9 +64,11 @@ class PreviewImages(TestCase): outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.remote_user_with_preview = models.User.objects.create_user( "badger@your.domain.here", "badger@badger.com", diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index b539f089b..80a35b94d 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -38,9 +38,11 @@ class Signature(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """create users and test data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.mouse = models.User.objects.create_user( f"mouse@{DOMAIN}", "mouse@example.com", diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py index 77b82e7ee..0a6dd8abe 100644 --- a/bookwyrm/tests/test_suggested_users.py +++ b/bookwyrm/tests/test_suggested_users.py @@ -22,9 +22,11 @@ class SuggestedUsers(TestCase): def setUp(self): """use a test csv""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/views/admin/test_announcements.py b/bookwyrm/tests/views/admin/test_announcements.py index 30bc94a1f..958d78fc4 100644 --- a/bookwyrm/tests/views/admin/test_announcements.py +++ b/bookwyrm/tests/views/admin/test_announcements.py @@ -14,9 +14,11 @@ class AnnouncementViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_automod.py b/bookwyrm/tests/views/admin/test_automod.py index 1835a24ee..332410eba 100644 --- a/bookwyrm/tests/views/admin/test_automod.py +++ b/bookwyrm/tests/views/admin/test_automod.py @@ -18,9 +18,11 @@ class AutomodViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_celery.py b/bookwyrm/tests/views/admin/test_celery.py index d215a9657..577d312b1 100644 --- a/bookwyrm/tests/views/admin/test_celery.py +++ b/bookwyrm/tests/views/admin/test_celery.py @@ -17,9 +17,11 @@ class CeleryStatusViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_dashboard.py b/bookwyrm/tests/views/admin/test_dashboard.py index 8eeb754a8..a68b046e3 100644 --- a/bookwyrm/tests/views/admin/test_dashboard.py +++ b/bookwyrm/tests/views/admin/test_dashboard.py @@ -17,9 +17,11 @@ class DashboardViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_email_blocks.py b/bookwyrm/tests/views/admin/test_email_blocks.py index 75c0be929..b37166d3c 100644 --- a/bookwyrm/tests/views/admin/test_email_blocks.py +++ b/bookwyrm/tests/views/admin/test_email_blocks.py @@ -17,9 +17,11 @@ class EmailBlocklistViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_email_config.py b/bookwyrm/tests/views/admin/test_email_config.py index 63d85cbef..374c2402e 100644 --- a/bookwyrm/tests/views/admin/test_email_config.py +++ b/bookwyrm/tests/views/admin/test_email_config.py @@ -17,9 +17,11 @@ class EmailConfigViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_federation.py b/bookwyrm/tests/views/admin/test_federation.py index 1a5067299..8244e8335 100644 --- a/bookwyrm/tests/views/admin/test_federation.py +++ b/bookwyrm/tests/views/admin/test_federation.py @@ -20,9 +20,11 @@ class FederationViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_imports.py b/bookwyrm/tests/views/admin/test_imports.py index 5a5599519..acb769546 100644 --- a/bookwyrm/tests/views/admin/test_imports.py +++ b/bookwyrm/tests/views/admin/test_imports.py @@ -17,9 +17,11 @@ class ImportsAdminViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_ip_blocklist.py b/bookwyrm/tests/views/admin/test_ip_blocklist.py index 06c110a06..b34828622 100644 --- a/bookwyrm/tests/views/admin/test_ip_blocklist.py +++ b/bookwyrm/tests/views/admin/test_ip_blocklist.py @@ -17,9 +17,11 @@ class IPBlocklistViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_link_domains.py b/bookwyrm/tests/views/admin/test_link_domains.py index 14eed419b..fabb7511a 100644 --- a/bookwyrm/tests/views/admin/test_link_domains.py +++ b/bookwyrm/tests/views/admin/test_link_domains.py @@ -17,9 +17,11 @@ class LinkDomainViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py index 4334eeed9..7ce665451 100644 --- a/bookwyrm/tests/views/admin/test_reports.py +++ b/bookwyrm/tests/views/admin/test_reports.py @@ -18,9 +18,11 @@ class ReportViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_site.py b/bookwyrm/tests/views/admin/test_site.py index b7c687e09..ec5b07e3a 100644 --- a/bookwyrm/tests/views/admin/test_site.py +++ b/bookwyrm/tests/views/admin/test_site.py @@ -17,9 +17,11 @@ class SiteSettingsViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_themes.py b/bookwyrm/tests/views/admin/test_themes.py index 66384f5fc..b931ea561 100644 --- a/bookwyrm/tests/views/admin/test_themes.py +++ b/bookwyrm/tests/views/admin/test_themes.py @@ -18,9 +18,11 @@ class AdminThemesViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/admin/test_user_admin.py b/bookwyrm/tests/views/admin/test_user_admin.py index 99c630526..5247ff70f 100644 --- a/bookwyrm/tests/views/admin/test_user_admin.py +++ b/bookwyrm/tests/views/admin/test_user_admin.py @@ -18,9 +18,11 @@ class UserAdminViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index 4d41eaa5d..68a114fb9 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -26,9 +26,11 @@ class BookViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index 169112bab..0bd962de5 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -22,9 +22,11 @@ class EditBookViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py index e89fd521b..b829d471b 100644 --- a/bookwyrm/tests/views/books/test_editions.py +++ b/bookwyrm/tests/views/books/test_editions.py @@ -16,9 +16,11 @@ class BookViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/books/test_links.py b/bookwyrm/tests/views/books/test_links.py index 817463656..d1040a591 100644 --- a/bookwyrm/tests/views/books/test_links.py +++ b/bookwyrm/tests/views/books/test_links.py @@ -18,8 +18,9 @@ class LinkViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), ): self.local_user = models.User.objects.create_user( "mouse@local.com", diff --git a/bookwyrm/tests/views/imports/test_import.py b/bookwyrm/tests/views/imports/test_import.py index d0612ee68..c3b2795b1 100644 --- a/bookwyrm/tests/views/imports/test_import.py +++ b/bookwyrm/tests/views/imports/test_import.py @@ -19,9 +19,11 @@ class ImportViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/imports/test_import_review.py b/bookwyrm/tests/views/imports/test_import_review.py index 27bb3f9d1..5da02a56a 100644 --- a/bookwyrm/tests/views/imports/test_import_review.py +++ b/bookwyrm/tests/views/imports/test_import_review.py @@ -14,9 +14,11 @@ class ImportManualReviewViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/imports/test_import_troubleshoot.py b/bookwyrm/tests/views/imports/test_import_troubleshoot.py index 0e12c406a..9ddc99785 100644 --- a/bookwyrm/tests/views/imports/test_import_troubleshoot.py +++ b/bookwyrm/tests/views/imports/test_import_troubleshoot.py @@ -15,9 +15,11 @@ class ImportTroubleshootViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/imports/test_user_import.py b/bookwyrm/tests/views/imports/test_user_import.py index db5837101..4a676a57f 100644 --- a/bookwyrm/tests/views/imports/test_user_import.py +++ b/bookwyrm/tests/views/imports/test_user_import.py @@ -18,9 +18,11 @@ class ImportUserViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index 1c05806a5..af85e84d4 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -31,9 +31,11 @@ class Inbox(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 5fbeaa33a..2bd5faf6a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -14,9 +14,11 @@ class InboxAdd(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index e6fdf9375..53555f213 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -14,9 +14,11 @@ class InboxActivities(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 9fef621ea..9cdf7eba3 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -13,9 +13,11 @@ class InboxBlock(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -56,9 +58,12 @@ class InboxBlock(TestCase): "object": "https://example.com/user/mouse", } - with patch( - "bookwyrm.activitystreams.remove_user_statuses_task.delay" - ) as redis_mock, patch("bookwyrm.lists_stream.remove_user_lists_task.delay"): + with ( + patch( + "bookwyrm.activitystreams.remove_user_statuses_task.delay" + ) as redis_mock, + patch("bookwyrm.lists_stream.remove_user_lists_task.delay"), + ): views.inbox.activity_task(activity) self.assertTrue(redis_mock.called) views.inbox.activity_task(activity) diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index c2045b092..7f5be5b65 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -15,9 +15,11 @@ class TransactionInboxCreate(TransactionTestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -74,9 +76,11 @@ class InboxCreate(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 8023308be..9c2b589e2 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -14,9 +14,11 @@ class InboxActivities(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index 180a57176..8ccffe1db 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -14,9 +14,11 @@ class InboxRelationships(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index 34c8c830b..4a397dcf8 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -13,9 +13,11 @@ class InboxActivities(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index d80a4fdd7..f0be2b17a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -13,9 +13,11 @@ class InboxRemove(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -76,9 +78,10 @@ class InboxRemove(TestCase): def test_handle_remove_book_from_list(self): """listing a book""" - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): booklist = models.List.objects.create( name="test list", user=self.local_user, diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index b9f924bad..fb2c85a88 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -15,9 +15,11 @@ class InboxUpdate(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """basic user and book data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", @@ -53,9 +55,10 @@ class InboxUpdate(TestCase): def test_update_list(self): """a new list""" - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): book_list = models.List.objects.create( name="hi", remote_id="https://example.com/list/22", user=self.local_user ) diff --git a/bookwyrm/tests/views/landing/test_invite.py b/bookwyrm/tests/views/landing/test_invite.py index f7ec73cf4..5a76f578b 100644 --- a/bookwyrm/tests/views/landing/test_invite.py +++ b/bookwyrm/tests/views/landing/test_invite.py @@ -17,9 +17,11 @@ class InviteViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/landing/test_landing.py b/bookwyrm/tests/views/landing/test_landing.py index b67857da8..c0581d893 100644 --- a/bookwyrm/tests/views/landing/test_landing.py +++ b/bookwyrm/tests/views/landing/test_landing.py @@ -17,9 +17,11 @@ class LandingViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/landing/test_login.py b/bookwyrm/tests/views/landing/test_login.py index 19ad1d2a0..283890e3e 100644 --- a/bookwyrm/tests/views/landing/test_login.py +++ b/bookwyrm/tests/views/landing/test_login.py @@ -20,9 +20,11 @@ class LoginViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py index ceceeb3e4..8f322b3cb 100644 --- a/bookwyrm/tests/views/landing/test_password.py +++ b/bookwyrm/tests/views/landing/test_password.py @@ -19,9 +19,11 @@ class PasswordViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py index 381a35a32..4b3d46673 100644 --- a/bookwyrm/tests/views/landing/test_register.py +++ b/bookwyrm/tests/views/landing/test_register.py @@ -23,9 +23,11 @@ class RegisterViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/lists/test_curate.py b/bookwyrm/tests/views/lists/test_curate.py index 7fa48f915..59d73cefd 100644 --- a/bookwyrm/tests/views/lists/test_curate.py +++ b/bookwyrm/tests/views/lists/test_curate.py @@ -18,9 +18,11 @@ class ListViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -36,9 +38,10 @@ class ListViews(TestCase): parent_work=work, ) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): self.list = models.List.objects.create( name="Test List", user=self.local_user ) diff --git a/bookwyrm/tests/views/lists/test_embed.py b/bookwyrm/tests/views/lists/test_embed.py index 40c51f5df..9c1d3846d 100644 --- a/bookwyrm/tests/views/lists/test_embed.py +++ b/bookwyrm/tests/views/lists/test_embed.py @@ -18,9 +18,11 @@ class ListViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -36,9 +38,10 @@ class ListViews(TestCase): parent_work=work, ) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): self.list = models.List.objects.create( name="Test List", user=self.local_user ) diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index b1e7e2acc..dc144c134 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -21,9 +21,11 @@ class ListViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -65,9 +67,10 @@ class ListViews(TestCase): parent_work=work_four, ) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): self.list = models.List.objects.create( name="Test List", user=self.local_user ) @@ -248,9 +251,12 @@ class ListViews(TestCase): ) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ) as mock, patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + ) as mock, + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): result = view(request, self.list.id) self.assertEqual(mock.call_count, 1) @@ -286,9 +292,12 @@ class ListViews(TestCase): ) request = self.factory.post("") request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ) as mock, patch("bookwyrm.lists_stream.remove_list_task.delay") as redis_mock: + with ( + patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + ) as mock, + patch("bookwyrm.lists_stream.remove_list_task.delay") as redis_mock, + ): views.delete_list(request, self.list.id) self.assertTrue(redis_mock.called) activity = json.loads(mock.call_args[1]["args"][1]) diff --git a/bookwyrm/tests/views/lists/test_list_item.py b/bookwyrm/tests/views/lists/test_list_item.py index ebdbdbc2e..e265d7ef5 100644 --- a/bookwyrm/tests/views/lists/test_list_item.py +++ b/bookwyrm/tests/views/lists/test_list_item.py @@ -15,9 +15,11 @@ class ListItemViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -32,9 +34,10 @@ class ListItemViews(TestCase): remote_id="https://example.com/book/1", parent_work=work, ) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): self.list = models.List.objects.create( name="Test List", user=self.local_user ) diff --git a/bookwyrm/tests/views/lists/test_lists.py b/bookwyrm/tests/views/lists/test_lists.py index 0d2213ee7..88ea71360 100644 --- a/bookwyrm/tests/views/lists/test_lists.py +++ b/bookwyrm/tests/views/lists/test_lists.py @@ -18,9 +18,11 @@ class ListViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -45,10 +47,10 @@ class ListViews(TestCase): def test_lists_page(self, _): """there are so many views, this just makes sure it LOADS""" view = views.Lists.as_view() - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.add_list_task.delay"), patch( - "bookwyrm.lists_stream.remove_list_task.delay" + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.add_list_task.delay"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), ): models.List.objects.create(name="Public list", user=self.local_user) models.List.objects.create( @@ -72,9 +74,10 @@ class ListViews(TestCase): def test_saved_lists_page(self): """there are so many views, this just makes sure it LOADS""" view = views.SavedLists.as_view() - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): booklist = models.List.objects.create( name="Public list", user=self.local_user ) @@ -94,9 +97,10 @@ class ListViews(TestCase): def test_saved_lists_page_empty(self): """there are so many views, this just makes sure it LOADS""" view = views.SavedLists.as_view() - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): models.List.objects.create(name="Public list", user=self.local_user) models.List.objects.create( name="Private list", privacy="direct", user=self.local_user @@ -122,9 +126,10 @@ class ListViews(TestCase): def test_user_lists_page(self): """there are so many views, this just makes sure it LOADS""" view = views.UserLists.as_view() - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): models.List.objects.create(name="Public list", user=self.local_user) models.List.objects.create( name="Private list", privacy="direct", user=self.local_user @@ -160,9 +165,12 @@ class ListViews(TestCase): }, ) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ) as mock, patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + ) as mock, + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): result = view(request) self.assertEqual(mock.call_count, 1) diff --git a/bookwyrm/tests/views/preferences/test_block.py b/bookwyrm/tests/views/preferences/test_block.py index 86ef95e7e..bc39d2f62 100644 --- a/bookwyrm/tests/views/preferences/test_block.py +++ b/bookwyrm/tests/views/preferences/test_block.py @@ -16,9 +16,11 @@ class BlockViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -65,8 +67,9 @@ class BlockViews(TestCase): request = self.factory.post("") request.user = self.local_user - with patch("bookwyrm.activitystreams.remove_user_statuses_task.delay"), patch( - "bookwyrm.lists_stream.remove_user_lists_task.delay" + with ( + patch("bookwyrm.activitystreams.remove_user_statuses_task.delay"), + patch("bookwyrm.lists_stream.remove_user_lists_task.delay"), ): view(request, self.remote_user.id) block = models.UserBlocks.objects.get() @@ -82,8 +85,9 @@ class BlockViews(TestCase): request = self.factory.post("") request.user = self.local_user - with patch("bookwyrm.activitystreams.add_user_statuses_task.delay"), patch( - "bookwyrm.lists_stream.add_user_lists_task.delay" + with ( + patch("bookwyrm.activitystreams.add_user_statuses_task.delay"), + patch("bookwyrm.lists_stream.add_user_lists_task.delay"), ): views.unblock(request, self.remote_user.id) diff --git a/bookwyrm/tests/views/preferences/test_change_password.py b/bookwyrm/tests/views/preferences/test_change_password.py index 49eac998c..1717204bd 100644 --- a/bookwyrm/tests/views/preferences/test_change_password.py +++ b/bookwyrm/tests/views/preferences/test_change_password.py @@ -15,9 +15,11 @@ class ChangePasswordViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/preferences/test_delete_user.py b/bookwyrm/tests/views/preferences/test_delete_user.py index d97ef0d38..94d8c4a69 100644 --- a/bookwyrm/tests/views/preferences/test_delete_user.py +++ b/bookwyrm/tests/views/preferences/test_delete_user.py @@ -19,9 +19,11 @@ class DeleteUserViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.mouse", @@ -40,9 +42,10 @@ class DeleteUserViews(TestCase): 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.apply_async" - ), patch("bookwyrm.activitystreams.add_book_statuses_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), + ): models.ShelfBook.objects.create( book=self.book, user=self.local_user, diff --git a/bookwyrm/tests/views/preferences/test_edit_user.py b/bookwyrm/tests/views/preferences/test_edit_user.py index 1ed4e3240..4b83f3b80 100644 --- a/bookwyrm/tests/views/preferences/test_edit_user.py +++ b/bookwyrm/tests/views/preferences/test_edit_user.py @@ -21,9 +21,11 @@ class EditUserViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -38,9 +40,10 @@ class EditUserViews(TestCase): 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.apply_async" - ), patch("bookwyrm.activitystreams.add_book_statuses_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), + ): models.ShelfBook.objects.create( book=self.book, user=self.local_user, diff --git a/bookwyrm/tests/views/preferences/test_export.py b/bookwyrm/tests/views/preferences/test_export.py index 3f758b2f7..128b8fc8b 100644 --- a/bookwyrm/tests/views/preferences/test_export.py +++ b/bookwyrm/tests/views/preferences/test_export.py @@ -22,8 +22,9 @@ class ExportViews(TestCase): self, ): # pylint: disable=bad-classmethod-argument, disable=invalid-name """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), ): self.local_user = models.User.objects.create_user( "mouse@local.com", diff --git a/bookwyrm/tests/views/preferences/test_export_user.py b/bookwyrm/tests/views/preferences/test_export_user.py index 654ed2a05..57a7c2ca5 100644 --- a/bookwyrm/tests/views/preferences/test_export_user.py +++ b/bookwyrm/tests/views/preferences/test_export_user.py @@ -15,8 +15,9 @@ class ExportUserViews(TestCase): def setUp(self): self.factory = RequestFactory() models.SiteSettings.objects.create() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), ): self.local_user = models.User.objects.create_user( "hugh@example.com", diff --git a/bookwyrm/tests/views/preferences/test_two_factor_auth.py b/bookwyrm/tests/views/preferences/test_two_factor_auth.py index dbd9c1f5b..8eb5e92c7 100644 --- a/bookwyrm/tests/views/preferences/test_two_factor_auth.py +++ b/bookwyrm/tests/views/preferences/test_two_factor_auth.py @@ -20,9 +20,11 @@ class TwoFactorViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.com", @@ -130,8 +132,9 @@ class TwoFactorViews(TestCase): request.session["2fa_user"] = self.local_user.username request.session.save() - with patch("bookwyrm.views.preferences.two_factor_auth.LoginWith2FA"), patch( - "bookwyrm.views.preferences.two_factor_auth.login" + with ( + patch("bookwyrm.views.preferences.two_factor_auth.LoginWith2FA"), + patch("bookwyrm.views.preferences.two_factor_auth.login"), ): result = view(request) self.assertEqual(result.url, "/") diff --git a/bookwyrm/tests/views/shelf/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py index b96d0a9ed..57631974f 100644 --- a/bookwyrm/tests/views/shelf/test_shelf.py +++ b/bookwyrm/tests/views/shelf/test_shelf.py @@ -23,9 +23,11 @@ class ShelfViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py index eea17b62d..ee5854d18 100644 --- a/bookwyrm/tests/views/shelf/test_shelf_actions.py +++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py @@ -21,9 +21,11 @@ class ShelfActionViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_annual_summary.py b/bookwyrm/tests/views/test_annual_summary.py index d51060a72..2fd7dc4eb 100644 --- a/bookwyrm/tests/views/test_annual_summary.py +++ b/bookwyrm/tests/views/test_annual_summary.py @@ -24,9 +24,11 @@ class AnnualSummary(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 669149af2..bee057d0c 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -19,9 +19,11 @@ class AuthorViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index 7e9e97522..e2bef539e 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -16,9 +16,11 @@ class DirectoryViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py index 9aa139074..937039592 100644 --- a/bookwyrm/tests/views/test_discover.py +++ b/bookwyrm/tests/views/test_discover.py @@ -14,9 +14,11 @@ class DiscoverViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index 33dbd4ea5..fb2609575 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -27,9 +27,11 @@ class FeedViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index e70ace769..61a0a82ce 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -21,9 +21,11 @@ class FollowViews(TestCase): def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" models.SiteSettings.objects.create() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -78,9 +80,11 @@ class FollowViews(TestCase): def test_handle_follow_local_manually_approves(self, *_): """send a follow request""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): rat = models.User.objects.create_user( "rat@local.com", "rat@rat.com", @@ -104,9 +108,11 @@ class FollowViews(TestCase): def test_handle_follow_local(self, *_): """send a follow request""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): rat = models.User.objects.create_user( "rat@local.com", "rat@rat.com", diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 84a49cafc..5d6aa8782 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -15,9 +15,11 @@ class GetStartedViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index 3d87d8538..49227457b 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -18,9 +18,11 @@ class GoalViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py index 4d678c31a..ca9284686 100644 --- a/bookwyrm/tests/views/test_group.py +++ b/bookwyrm/tests/views/test_group.py @@ -19,9 +19,11 @@ class GroupViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/views/test_hashtag.py b/bookwyrm/tests/views/test_hashtag.py index 1c8b31dce..5979238d8 100644 --- a/bookwyrm/tests/views/test_hashtag.py +++ b/bookwyrm/tests/views/test_hashtag.py @@ -16,9 +16,11 @@ class HashtagView(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -53,9 +55,10 @@ class HashtagView(TestCase): ) self.hashtag_bookclub = models.Hashtag.objects.create(name="#BookClub") - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.activitystreams.add_status_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.delay"), + ): self.statuses_bookclub = [ models.Comment.objects.create( book=self.book, user=self.local_user, content="#BookClub" @@ -91,9 +94,10 @@ class HashtagView(TestCase): request = self.factory.get("") hashtag = models.Hashtag.objects.create(name="#test") - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.activitystreams.add_status_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.delay"), + ): status = models.Comment.objects.create( user=self.local_user, book=self.book, content="#test", privacy="direct" ) @@ -115,9 +119,10 @@ class HashtagView(TestCase): request = self.factory.get("") hashtag = models.Hashtag.objects.create(name="#test") - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.activitystreams.add_status_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.delay"), + ): status = models.Comment.objects.create( user=self.local_user, book=self.book, @@ -143,9 +148,10 @@ class HashtagView(TestCase): request = self.factory.get("") hashtag = models.Hashtag.objects.create(name="#test") - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.activitystreams.add_status_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.delay"), + ): status = models.Comment.objects.create( user=self.local_user, book=self.book, diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index 9472cf762..2f2481931 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -21,9 +21,11 @@ class ViewsHelpers(TestCase): # pylint: disable=too-many-public-methods @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): with patch("bookwyrm.suggested_users.rerank_user_task.delay"): self.local_user = models.User.objects.create_user( "mouse@local.com", diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 1565b96a8..95d7b5791 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -15,9 +15,11 @@ class InteractionViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index ca451bef8..bb66c8f3e 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -17,9 +17,11 @@ class IsbnViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 8d239d77a..c44940742 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -15,9 +15,11 @@ class NotificationViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -148,9 +150,10 @@ class NotificationViews(TestCase): def test_notifications_page_list(self): """Adding books to lists""" book = models.Edition.objects.create(title="shape") - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): book_list = models.List.objects.create(user=self.local_user, name="hi") item = models.ListItem.objects.create( book=book, user=self.another_user, book_list=book_list, order=1 diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py index 78c4d0edc..ca289db3f 100644 --- a/bookwyrm/tests/views/test_outbox.py +++ b/bookwyrm/tests/views/test_outbox.py @@ -18,9 +18,11 @@ class OutboxView(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we'll need some data""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index fab1c1fc9..39c611d6c 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -18,9 +18,11 @@ class ReadingViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index 4f5b1e478..113b3161d 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -24,9 +24,11 @@ class ReadThrough(TestCase): title="Example Edition", parent_work=self.work ) - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.user = models.User.objects.create_user( "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" ) diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py index 3e4c64f68..65670dcbf 100644 --- a/bookwyrm/tests/views/test_report.py +++ b/bookwyrm/tests/views/test_report.py @@ -14,9 +14,11 @@ class ReportViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -31,9 +33,10 @@ class ReportViews(TestCase): local=True, localname="rat", ) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.activitystreams.add_status_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.delay"), + ): self.status = models.Status.objects.create( user=self.local_user, content="Test status", diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index a63bdea94..af5ad5301 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -14,9 +14,11 @@ class RssFeedView(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "rss_user", "rss@test.rss", "password", local=True ) diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 425b96cd3..5e06e6f81 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -20,9 +20,11 @@ class Views(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -164,9 +166,10 @@ class Views(TestCase): def test_search_lists(self): """searches remote connectors""" - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.lists_stream.remove_list_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.lists_stream.remove_list_task.delay"), + ): booklist = models.List.objects.create( user=self.local_user, name="test list" ) diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 7b0c39338..f5fe515f1 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -19,9 +19,11 @@ class StatusTransactions(TransactionTestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", @@ -77,9 +79,11 @@ class StatusViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index 37cb2e6c6..129aa8d71 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -15,9 +15,11 @@ class UpdateViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -54,11 +56,14 @@ class UpdateViews(TestCase): request = self.factory.get("") request.user = self.local_user - with patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count" - ) as mock_count, patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" - ) as mock_count_by_status: + with ( + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count" + ) as mock_count, + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" + ) as mock_count_by_status, + ): mock_count.return_value = 3 mock_count_by_status.return_value = {"review": 5} result = views.get_unread_status_string(request, "home") @@ -73,11 +78,14 @@ class UpdateViews(TestCase): request = self.factory.get("") request.user = self.local_user - with patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count" - ) as mock_count, patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" - ) as mock_count_by_status: + with ( + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count" + ) as mock_count, + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" + ) as mock_count_by_status, + ): mock_count.return_value = 3 mock_count_by_status.return_value = { "generated_note": 1, diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index d4e11ff2e..4b49f120e 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -18,9 +18,11 @@ class UserViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", @@ -34,10 +36,10 @@ class UserViews(TestCase): 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.apply_async" - ), patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.add_book_statuses_task.delay" + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), ): models.ShelfBook.objects.create( book=self.book, diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index 4617942fa..d8bf0d062 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -16,9 +16,11 @@ class WellknownViews(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): self.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", From 4b9fe0af0c811c90415d099fa2e6973fe25e9152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 17 Mar 2024 20:36:48 -0300 Subject: [PATCH 107/200] Remove nesting in several with..patch calls --- .../tests/activitypub/test_base_activity.py | 10 ++-- bookwyrm/tests/importers/test_importer.py | 8 ++-- .../tests/models/test_bookwyrm_import_job.py | 46 +++++++++---------- bookwyrm/tests/models/test_import_model.py | 18 ++++---- bookwyrm/tests/test_signing.py | 8 ++-- .../tests/views/inbox/test_inbox_announce.py | 16 ++++--- bookwyrm/tests/views/inbox/test_inbox_like.py | 16 ++++--- bookwyrm/tests/views/test_helpers.py | 46 ++++++++++--------- bookwyrm/tests/views/test_updates.py | 26 ++++------- 9 files changed, 100 insertions(+), 94 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 8f2cd7fb2..735353452 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -234,10 +234,12 @@ class BaseActivity(TestCase): ) # sets the celery task call to the function call - with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"): - with patch("bookwyrm.models.status.Status.ignore_activity") as discarder: - discarder.return_value = False - update_data.to_model(model=models.Status, instance=status) + with ( + patch("bookwyrm.activitypub.base_activity.set_related_field.delay"), + patch("bookwyrm.models.status.Status.ignore_activity") as discarder, + ): + discarder.return_value = False + update_data.to_model(model=models.Status, instance=status) self.assertIsNone(status.attachments.first()) @responses.activate diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 494d28ad0..a18aedd51 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -268,9 +268,11 @@ class GenericImporter(TestCase): import_item.book = self.book import_item.save() - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - with patch("bookwyrm.models.Status.broadcast") as broadcast_mock: - handle_imported_book(import_item) + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.models.Status.broadcast") as broadcast_mock, + ): + handle_imported_book(import_item) kwargs = broadcast_mock.call_args.kwargs self.assertEqual(kwargs["software"], "bookwyrm") review = models.Review.objects.get(book=self.book, user=self.local_user) diff --git a/bookwyrm/tests/models/test_bookwyrm_import_job.py b/bookwyrm/tests/models/test_bookwyrm_import_job.py index 50c136f21..259d8f5a4 100644 --- a/bookwyrm/tests/models/test_bookwyrm_import_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_import_job.py @@ -24,7 +24,6 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.lists_stream.populate_lists_task.delay"), patch("bookwyrm.suggested_users.rerank_user_task.delay"), ): - self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", @@ -84,13 +83,13 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.suggested_users.rerank_user_task.delay"), ): - - with open(self.archive_file, "rb") as fileobj: - with BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile: - - models.bookwyrm_import_job.update_user_profile( - self.local_user, tarfile, self.json_data - ) + with ( + open(self.archive_file, "rb") as fileobj, + BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile, + ): + models.bookwyrm_import_job.update_user_profile( + self.local_user, tarfile, self.json_data + ) self.local_user.refresh_from_db() @@ -111,7 +110,6 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.suggested_users.rerank_user_task.delay"), ): - models.bookwyrm_import_job.update_user_settings( self.local_user, self.json_data ) @@ -256,14 +254,15 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods self.assertEqual(models.Edition.objects.count(), 1) - with open(self.archive_file, "rb") as fileobj: - with BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile: + with ( + open(self.archive_file, "rb") as fileobj, + BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile, + ): + bookwyrm_import_job.get_or_create_edition( + self.json_data["books"][1], tarfile + ) # Sand Talk - bookwyrm_import_job.get_or_create_edition( - self.json_data["books"][1], tarfile - ) # Sand Talk - - self.assertEqual(models.Edition.objects.count(), 1) + self.assertEqual(models.Edition.objects.count(), 1) def test_get_or_create_edition_not_existing(self): """Test take a JSON string of books and editions, @@ -272,12 +271,13 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods self.assertEqual(models.Edition.objects.count(), 1) - with open(self.archive_file, "rb") as fileobj: - with BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile: - - bookwyrm_import_job.get_or_create_edition( - self.json_data["books"][0], tarfile - ) # Seeing like a state + with ( + open(self.archive_file, "rb") as fileobj, + BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile, + ): + bookwyrm_import_job.get_or_create_edition( + self.json_data["books"][0], tarfile + ) # Seeing like a state self.assertTrue(models.Edition.objects.filter(isbn_13="9780300070163").exists()) self.assertEqual(models.Edition.objects.count(), 2) @@ -326,7 +326,6 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True), ): - bookwyrm_import_job.upsert_statuses( self.local_user, models.Review, reviews, self.book.remote_id ) @@ -364,7 +363,6 @@ class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True), ): - bookwyrm_import_job.upsert_statuses( self.local_user, models.Comment, comments, self.book.remote_id ) diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index e5be01464..aa7b5b132 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -194,14 +194,16 @@ class ImportJob(TestCase): status=200, ) - with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): - with patch( + with ( + patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"), + patch( "bookwyrm.connectors.connector_manager.first_search_result" - ) as search: - search.return_value = result - with patch( - "bookwyrm.connectors.openlibrary.Connector.get_authors_from_data" - ): - book = item.get_book_from_identifier() + ) as search, + ): + search.return_value = result + with patch( + "bookwyrm.connectors.openlibrary.Connector.get_authors_from_data" + ): + book = item.get_book_from_identifier() self.assertEqual(book.title, "Sabriel") diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 80a35b94d..70f8e47cf 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -91,9 +91,11 @@ class Signature(TestCase): signature = make_signature( "post", signer or sender, self.rat.inbox, now, digest=digest ) - with patch("bookwyrm.views.inbox.activity_task.apply_async"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - return self.send(signature, now, send_data or data, digest) + with ( + patch("bookwyrm.views.inbox.activity_task.apply_async"), + patch("bookwyrm.models.user.set_remote_server.delay"), + ): + return self.send(signature, now, send_data or data, digest) def test_correct_signature(self): """this one should just work""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 53555f213..d982a91c8 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -39,13 +39,15 @@ class InboxActivities(TestCase): outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - with patch("bookwyrm.activitystreams.add_status_task.delay"): - self.status = models.Status.objects.create( - user=self.local_user, - content="Test status", - remote_id="https://example.com/status/1", - ) + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.delay"), + ): + self.status = models.Status.objects.create( + user=self.local_user, + content="Test status", + remote_id="https://example.com/status/1", + ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index 4a397dcf8..4efe4cb98 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -38,13 +38,15 @@ class InboxActivities(TestCase): outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - with patch("bookwyrm.activitystreams.add_status_task.delay"): - self.status = models.Status.objects.create( - user=self.local_user, - content="Test status", - remote_id="https://example.com/status/1", - ) + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.delay"), + ): + self.status = models.Status.objects.create( + user=self.local_user, + content="Test status", + remote_id="https://example.com/status/1", + ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index 2f2481931..e00e1d234 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -25,29 +25,31 @@ class ViewsHelpers(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), + patch("bookwyrm.suggested_users.rerank_user_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", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - discoverable=True, - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + 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"), + patch("bookwyrm.suggested_users.rerank_user_task.delay"), + ): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + discoverable=True, + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.work = models.Work.objects.create(title="Test Work") self.book = models.Edition.objects.create( title="Test Book", diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index 129aa8d71..6f826b46f 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -56,14 +56,11 @@ class UpdateViews(TestCase): request = self.factory.get("") request.user = self.local_user - with ( - patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count" - ) as mock_count, - patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" - ) as mock_count_by_status, - ): + with patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count" + ) as mock_count, patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" + ) as mock_count_by_status: mock_count.return_value = 3 mock_count_by_status.return_value = {"review": 5} result = views.get_unread_status_string(request, "home") @@ -78,14 +75,11 @@ class UpdateViews(TestCase): request = self.factory.get("") request.user = self.local_user - with ( - patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count" - ) as mock_count, - patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" - ) as mock_count_by_status, - ): + with patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count" + ) as mock_count, patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" + ) as mock_count_by_status: mock_count.return_value = 3 mock_count_by_status.return_value = { "generated_note": 1, From e2c9ea3cd27769814603790e580d44246f3b9fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 17 Mar 2024 20:52:20 -0300 Subject: [PATCH 108/200] Fix instances of `bad-classmethod-argument` in recently edited files --- .../tests/activitypub/test_base_activity.py | 8 +++--- bookwyrm/tests/activitypub/test_note.py | 10 +++---- .../activitystreams/test_abstractstream.py | 10 +++---- .../tests/activitystreams/test_booksstream.py | 8 +++--- .../tests/activitystreams/test_homestream.py | 8 +++--- .../tests/activitystreams/test_localstream.py | 10 +++---- .../tests/activitystreams/test_signals.py | 6 ++-- bookwyrm/tests/activitystreams/test_tasks.py | 14 ++++------ .../connectors/test_inventaire_connector.py | 2 +- .../tests/importers/test_calibre_import.py | 6 ++-- .../tests/importers/test_goodreads_import.py | 6 ++-- bookwyrm/tests/importers/test_importer.py | 6 ++-- .../importers/test_librarything_import.py | 6 ++-- .../importers/test_openlibrary_import.py | 6 ++-- .../tests/importers/test_storygraph_import.py | 6 ++-- bookwyrm/tests/lists_stream/test_signals.py | 8 +++--- bookwyrm/tests/lists_stream/test_stream.py | 10 +++---- bookwyrm/tests/lists_stream/test_tasks.py | 12 ++++---- .../management/test_populate_lists_streams.py | 10 +++---- .../tests/management/test_populate_streams.py | 10 +++---- .../tests/models/test_activitypub_mixin.py | 10 +++---- bookwyrm/tests/models/test_automod.py | 4 +-- bookwyrm/tests/models/test_base_model.py | 6 ++-- bookwyrm/tests/models/test_group.py | 28 +++++++++---------- bookwyrm/tests/models/test_import_model.py | 4 +-- bookwyrm/tests/models/test_list.py | 6 ++-- bookwyrm/tests/models/test_notification.py | 20 ++++++------- .../tests/models/test_readthrough_model.py | 10 +++---- .../tests/models/test_relationship_models.py | 10 +++---- bookwyrm/tests/models/test_shelf_model.py | 6 ++-- bookwyrm/tests/models/test_site.py | 4 +-- bookwyrm/tests/models/test_status_model.py | 8 +++--- bookwyrm/tests/models/test_user_model.py | 6 ++-- .../templatetags/test_book_display_tags.py | 6 ++-- .../tests/templatetags/test_feed_page_tags.py | 6 ++-- .../tests/templatetags/test_interaction.py | 8 +++--- .../test_notification_page_tags.py | 4 +-- .../tests/templatetags/test_rating_tags.py | 8 +++--- .../tests/templatetags/test_shelf_tags.py | 8 +++--- .../tests/templatetags/test_status_display.py | 8 +++--- bookwyrm/tests/templatetags/test_utilities.py | 10 +++---- bookwyrm/tests/test_context_processors.py | 10 +++---- bookwyrm/tests/test_emailing.py | 4 +-- bookwyrm/tests/test_signing.py | 8 +++--- .../tests/views/admin/test_announcements.py | 4 +-- bookwyrm/tests/views/admin/test_automod.py | 6 ++-- bookwyrm/tests/views/admin/test_celery.py | 6 ++-- bookwyrm/tests/views/admin/test_dashboard.py | 6 ++-- .../tests/views/admin/test_email_blocks.py | 6 ++-- .../tests/views/admin/test_email_config.py | 6 ++-- bookwyrm/tests/views/admin/test_federation.py | 8 +++--- bookwyrm/tests/views/admin/test_imports.py | 6 ++-- .../tests/views/admin/test_ip_blocklist.py | 6 ++-- .../tests/views/admin/test_link_domains.py | 12 ++++---- bookwyrm/tests/views/admin/test_reports.py | 8 +++--- bookwyrm/tests/views/admin/test_site.py | 8 +++--- bookwyrm/tests/views/admin/test_themes.py | 10 +++---- bookwyrm/tests/views/admin/test_user_admin.py | 6 ++-- bookwyrm/tests/views/books/test_book.py | 14 +++++----- bookwyrm/tests/views/books/test_edit_book.py | 14 +++++----- bookwyrm/tests/views/books/test_editions.py | 10 +++---- bookwyrm/tests/views/books/test_links.py | 12 ++++---- bookwyrm/tests/views/imports/test_import.py | 4 +-- .../tests/views/imports/test_import_review.py | 8 +++--- .../views/imports/test_import_troubleshoot.py | 4 +-- bookwyrm/tests/views/inbox/test_inbox.py | 4 +-- bookwyrm/tests/views/inbox/test_inbox_add.py | 6 ++-- .../tests/views/inbox/test_inbox_announce.py | 14 +++++----- .../tests/views/inbox/test_inbox_block.py | 10 +++---- .../tests/views/inbox/test_inbox_create.py | 10 +++---- .../tests/views/inbox/test_inbox_delete.py | 14 +++++----- .../tests/views/inbox/test_inbox_follow.py | 10 +++---- bookwyrm/tests/views/inbox/test_inbox_like.py | 14 +++++----- .../tests/views/inbox/test_inbox_remove.py | 16 +++++------ .../tests/views/inbox/test_inbox_update.py | 10 +++---- bookwyrm/tests/views/landing/test_invite.py | 4 +-- bookwyrm/tests/views/landing/test_landing.py | 4 +-- bookwyrm/tests/views/landing/test_login.py | 8 +++--- bookwyrm/tests/views/landing/test_password.py | 4 +-- bookwyrm/tests/views/landing/test_register.py | 6 ++-- bookwyrm/tests/views/lists/test_curate.py | 10 +++---- bookwyrm/tests/views/lists/test_embed.py | 10 +++---- bookwyrm/tests/views/lists/test_list.py | 18 ++++++------ bookwyrm/tests/views/lists/test_list_item.py | 10 +++---- bookwyrm/tests/views/lists/test_lists.py | 6 ++-- .../tests/views/preferences/test_block.py | 6 ++-- .../views/preferences/test_change_password.py | 4 +-- .../views/preferences/test_delete_user.py | 14 +++++----- .../tests/views/preferences/test_edit_user.py | 14 +++++----- .../tests/views/preferences/test_export.py | 12 ++++---- .../views/preferences/test_two_factor_auth.py | 4 +-- bookwyrm/tests/views/shelf/test_shelf.py | 14 +++++----- .../tests/views/shelf/test_shelf_actions.py | 16 +++++------ bookwyrm/tests/views/test_annual_summary.py | 10 +++---- bookwyrm/tests/views/test_author.py | 14 +++++----- bookwyrm/tests/views/test_directory.py | 4 +-- bookwyrm/tests/views/test_discover.py | 4 +-- bookwyrm/tests/views/test_feed.py | 8 +++--- bookwyrm/tests/views/test_follow.py | 16 +++++------ bookwyrm/tests/views/test_get_started.py | 8 +++--- bookwyrm/tests/views/test_goal.py | 8 +++--- bookwyrm/tests/views/test_group.py | 14 +++++----- bookwyrm/tests/views/test_hashtag.py | 26 ++++++++--------- bookwyrm/tests/views/test_helpers.py | 16 +++++------ bookwyrm/tests/views/test_interaction.py | 8 +++--- bookwyrm/tests/views/test_isbn.py | 10 +++---- bookwyrm/tests/views/test_notifications.py | 10 +++---- bookwyrm/tests/views/test_outbox.py | 6 ++-- bookwyrm/tests/views/test_reading.py | 12 ++++---- bookwyrm/tests/views/test_readthrough.py | 10 +++---- bookwyrm/tests/views/test_report.py | 10 +++---- bookwyrm/tests/views/test_rss_feed.py | 6 ++-- bookwyrm/tests/views/test_search.py | 10 +++---- bookwyrm/tests/views/test_status.py | 12 ++++---- bookwyrm/tests/views/test_updates.py | 4 +-- bookwyrm/tests/views/test_user.py | 14 +++++----- bookwyrm/tests/views/test_wellknown.py | 4 +-- 117 files changed, 515 insertions(+), 529 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 735353452..b529f6ae5 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -29,18 +29,18 @@ class BaseActivity(TestCase): """the super class for model-linked activitypub dataclasses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we're probably going to re-use this so why copy/paste""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.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, update_fields=["remote_id"]) + cls.user.remote_id = "http://example.com/a/b" + cls.user.save(broadcast=False, update_fields=["remote_id"]) def setUp(self): datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") diff --git a/bookwyrm/tests/activitypub/test_note.py b/bookwyrm/tests/activitypub/test_note.py index 65502c70a..33fc04d91 100644 --- a/bookwyrm/tests/activitypub/test_note.py +++ b/bookwyrm/tests/activitypub/test_note.py @@ -11,20 +11,20 @@ class Note(TestCase): """the model-linked ActivityPub dataclass for Note-based types""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create a shared user""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - self.user.remote_id = "https://test-instance.org/user/critic" - self.user.save(broadcast=False, update_fields=["remote_id"]) + cls.user.remote_id = "https://test-instance.org/user/critic" + cls.user.save(broadcast=False, update_fields=["remote_id"]) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Test Edition", remote_id="http://book.com/book" ) diff --git a/bookwyrm/tests/activitystreams/test_abstractstream.py b/bookwyrm/tests/activitystreams/test_abstractstream.py index acdd5529c..3a95e2efa 100644 --- a/bookwyrm/tests/activitystreams/test_abstractstream.py +++ b/bookwyrm/tests/activitystreams/test_abstractstream.py @@ -16,17 +16,17 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """use a test csv""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -34,7 +34,7 @@ class Activitystreams(TestCase): localname="nutria", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -44,7 +44,7 @@ class Activitystreams(TestCase): 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) + cls.book = models.Edition.objects.create(title="test book", parent_work=work) def setUp(self): """per-test setUp""" diff --git a/bookwyrm/tests/activitystreams/test_booksstream.py b/bookwyrm/tests/activitystreams/test_booksstream.py index eb61cc203..07a4c52f4 100644 --- a/bookwyrm/tests/activitystreams/test_booksstream.py +++ b/bookwyrm/tests/activitystreams/test_booksstream.py @@ -15,18 +15,18 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """use a test csv""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -36,7 +36,7 @@ class Activitystreams(TestCase): 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) + cls.book = models.Edition.objects.create(title="test book", parent_work=work) def test_get_statuses_for_user_books(self, *_): """create a stream for a user""" diff --git a/bookwyrm/tests/activitystreams/test_homestream.py b/bookwyrm/tests/activitystreams/test_homestream.py index 0baf1d1b8..feadaab1b 100644 --- a/bookwyrm/tests/activitystreams/test_homestream.py +++ b/bookwyrm/tests/activitystreams/test_homestream.py @@ -13,17 +13,17 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """use a test csv""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -31,7 +31,7 @@ class Activitystreams(TestCase): localname="nutria", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/activitystreams/test_localstream.py b/bookwyrm/tests/activitystreams/test_localstream.py index 92ec2b069..508a289b2 100644 --- a/bookwyrm/tests/activitystreams/test_localstream.py +++ b/bookwyrm/tests/activitystreams/test_localstream.py @@ -13,17 +13,17 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """use a test csv""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -31,7 +31,7 @@ class Activitystreams(TestCase): localname="nutria", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -41,7 +41,7 @@ class Activitystreams(TestCase): 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) + cls.book = models.Edition.objects.create(title="test book", parent_work=work) def test_localstream_get_audience_remote_status(self, *_): """get a list of users that should see a status""" diff --git a/bookwyrm/tests/activitystreams/test_signals.py b/bookwyrm/tests/activitystreams/test_signals.py index b9fb75ade..77ac68e71 100644 --- a/bookwyrm/tests/activitystreams/test_signals.py +++ b/bookwyrm/tests/activitystreams/test_signals.py @@ -15,18 +15,18 @@ class ActivitystreamsSignals(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """use a test csv""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/activitystreams/test_tasks.py b/bookwyrm/tests/activitystreams/test_tasks.py index cf2ee40e6..28bd68bf2 100644 --- a/bookwyrm/tests/activitystreams/test_tasks.py +++ b/bookwyrm/tests/activitystreams/test_tasks.py @@ -8,17 +8,17 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """use a test csv""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -26,7 +26,7 @@ class Activitystreams(TestCase): localname="nutria", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -36,11 +36,9 @@ class Activitystreams(TestCase): 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) + cls.book = models.Edition.objects.create(title="test book", parent_work=work) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - self.status = models.Status.objects.create( - content="hi", user=self.local_user - ) + cls.status = models.Status.objects.create(content="hi", user=cls.local_user) def test_add_book_statuses_task(self): """statuses related to a book""" diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index 874d64862..7844f3919 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -15,7 +15,7 @@ class Inventaire(TestCase): """test loading data from inventaire.io""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """creates the connector in the database""" models.Connector.objects.create( identifier="inventaire.io", diff --git a/bookwyrm/tests/importers/test_calibre_import.py b/bookwyrm/tests/importers/test_calibre_import.py index 6bfa754af..dcbe68c64 100644 --- a/bookwyrm/tests/importers/test_calibre_import.py +++ b/bookwyrm/tests/importers/test_calibre_import.py @@ -23,19 +23,19 @@ class CalibreImport(TestCase): self.csv = open(datafile, "r", encoding=self.importer.encoding) @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """populate database""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index deb41a1df..f0b67cffd 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -30,19 +30,19 @@ class GoodreadsImport(TestCase): self.csv = open(datafile, "r", encoding=self.importer.encoding) @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """populate database""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index a18aedd51..ea10d0f53 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -33,19 +33,19 @@ class GenericImporter(TestCase): self.csv = open(datafile, "r", encoding=self.importer.encoding) @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """populate database""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index ba86721de..280131115 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -32,19 +32,19 @@ class LibrarythingImport(TestCase): self.csv = open(datafile, "r", encoding=self.importer.encoding) @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """populate database""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mmai", "mmai@mmai.mmai", "password", local=True ) models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index e0e6135c9..05bab0cc2 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -30,19 +30,19 @@ class OpenLibraryImport(TestCase): self.csv = open(datafile, "r", encoding=self.importer.encoding) @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """populate database""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/importers/test_storygraph_import.py b/bookwyrm/tests/importers/test_storygraph_import.py index 180cd8ad4..eee27010c 100644 --- a/bookwyrm/tests/importers/test_storygraph_import.py +++ b/bookwyrm/tests/importers/test_storygraph_import.py @@ -30,19 +30,19 @@ class StorygraphImport(TestCase): self.csv = open(datafile, "r", encoding=self.importer.encoding) @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """populate database""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/lists_stream/test_signals.py b/bookwyrm/tests/lists_stream/test_signals.py index 923d19a2f..f9e7e4d12 100644 --- a/bookwyrm/tests/lists_stream/test_signals.py +++ b/bookwyrm/tests/lists_stream/test_signals.py @@ -9,21 +9,21 @@ class ListsStreamSignals(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """database setup""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "fish", "fish@fish.fish", "password", local=True, localname="fish" ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/lists_stream/test_stream.py b/bookwyrm/tests/lists_stream/test_stream.py index fcac04d19..5d752dd57 100644 --- a/bookwyrm/tests/lists_stream/test_stream.py +++ b/bookwyrm/tests/lists_stream/test_stream.py @@ -16,17 +16,17 @@ class ListsStream(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """database setup""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -34,7 +34,7 @@ class ListsStream(TestCase): localname="nutria", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -43,7 +43,7 @@ class ListsStream(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.stream = lists_stream.ListsStream() + cls.stream = lists_stream.ListsStream() def test_lists_stream_ids(self, *_): """the abstract base class for stream objects""" diff --git a/bookwyrm/tests/lists_stream/test_tasks.py b/bookwyrm/tests/lists_stream/test_tasks.py index fe3cb319d..a127d363c 100644 --- a/bookwyrm/tests/lists_stream/test_tasks.py +++ b/bookwyrm/tests/lists_stream/test_tasks.py @@ -11,17 +11,17 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """database setup""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -29,7 +29,7 @@ class Activitystreams(TestCase): localname="nutria", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -42,8 +42,8 @@ class Activitystreams(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.lists_stream.remove_list_task.delay"), ): - self.list = models.List.objects.create( - user=self.local_user, name="hi", privacy="public" + cls.list = models.List.objects.create( + user=cls.local_user, name="hi", privacy="public" ) def test_populate_lists_task(self, *_): diff --git a/bookwyrm/tests/management/test_populate_lists_streams.py b/bookwyrm/tests/management/test_populate_lists_streams.py index f098c2b11..011011903 100644 --- a/bookwyrm/tests/management/test_populate_lists_streams.py +++ b/bookwyrm/tests/management/test_populate_lists_streams.py @@ -13,17 +13,17 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need some stuff""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -39,7 +39,7 @@ class Activitystreams(TestCase): is_active=False, ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -48,7 +48,7 @@ class Activitystreams(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="test book") + cls.book = models.Edition.objects.create(title="test book") def test_populate_streams(self, *_): """make sure the function on the redis manager gets called""" diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index 034222b29..c5b745c08 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -11,17 +11,17 @@ class Activitystreams(TestCase): """using redis to build activity streams""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need some stuff""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria", "nutria@nutria.nutria", "password", @@ -37,7 +37,7 @@ class Activitystreams(TestCase): is_active=False, ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -46,7 +46,7 @@ class Activitystreams(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="test book") + cls.book = models.Edition.objects.create(title="test book") def test_populate_streams(self, _): """make sure the function on the redis manager gets called""" diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index b59088f91..c7949cd28 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -27,20 +27,20 @@ class ActivitypubMixins(TestCase): """functionality shared across models""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """shared data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.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, update_fields=["remote_id"]) + cls.local_user.remote_id = "http://example.com/a/b" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/models/test_automod.py b/bookwyrm/tests/models/test_automod.py index ed3133cdc..5e10eb4d0 100644 --- a/bookwyrm/tests/models/test_automod.py +++ b/bookwyrm/tests/models/test_automod.py @@ -15,14 +15,14 @@ class AutomodModel(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index d0e441cef..d666b0e46 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -13,18 +13,18 @@ class BaseModel(TestCase): """functionality shared across models""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """shared data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py index 3ea424333..2c2960ac4 100644 --- a/bookwyrm/tests/models/test_group.py +++ b/bookwyrm/tests/models/test_group.py @@ -10,7 +10,7 @@ class Group(TestCase): """some activitypub oddness ahead""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """Set up for tests""" with ( @@ -18,15 +18,15 @@ class Group(TestCase): patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.owner_user = models.User.objects.create_user( + cls.owner_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) - self.badger = models.User.objects.create_user( + cls.badger = models.User.objects.create_user( "badger", "badger@badger.badger", "badgerword", @@ -34,7 +34,7 @@ class Group(TestCase): localname="badger", ) - self.capybara = models.User.objects.create_user( + cls.capybara = models.User.objects.create_user( "capybara", "capybara@capybara.capybara", "capybaraword", @@ -42,32 +42,32 @@ class Group(TestCase): localname="capybara", ) - self.public_group = models.Group.objects.create( + cls.public_group = models.Group.objects.create( name="Public Group", description="Initial description", - user=self.owner_user, + user=cls.owner_user, privacy="public", ) - self.private_group = models.Group.objects.create( + cls.private_group = models.Group.objects.create( name="Private Group", description="Top secret", - user=self.owner_user, + user=cls.owner_user, privacy="direct", ) - self.followers_only_group = models.Group.objects.create( + cls.followers_only_group = models.Group.objects.create( name="Followers Group", description="No strangers", - user=self.owner_user, + user=cls.owner_user, privacy="followers", ) - models.GroupMember.objects.create(group=self.private_group, user=self.badger) + models.GroupMember.objects.create(group=cls.private_group, user=cls.badger) models.GroupMember.objects.create( - group=self.followers_only_group, user=self.badger + group=cls.followers_only_group, user=cls.badger ) - models.GroupMember.objects.create(group=self.public_group, user=self.capybara) + models.GroupMember.objects.create(group=cls.public_group, user=cls.capybara) def test_group_members_can_see_private_groups(self, _): """direct privacy group should not be excluded from group listings for group diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index aa7b5b132..e591c33e8 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -17,14 +17,14 @@ class ImportJob(TestCase): """this is a fancy one!!!""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """data is from a goodreads export of The Raven Tower""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index b1b756cab..b9148853b 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -12,18 +12,18 @@ class List(TestCase): """some activitypub oddness ahead""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """look, a list""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) work = models.Work.objects.create(title="hello") - self.book = models.Edition.objects.create(title="hi", parent_work=work) + cls.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_notification.py b/bookwyrm/tests/models/test_notification.py index a9ed8b661..976ac39c9 100644 --- a/bookwyrm/tests/models/test_notification.py +++ b/bookwyrm/tests/models/test_notification.py @@ -8,21 +8,21 @@ class Notification(TestCase): """let people know things""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """useful things for creating a notification""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -31,14 +31,14 @@ class Notification(TestCase): 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( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Test Book", isbn_13="1234567890123", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) - self.another_book = models.Edition.objects.create( + cls.another_book = models.Edition.objects.create( title="Second Test Book", parent_work=models.Work.objects.create(title="Test Work"), ) @@ -201,14 +201,14 @@ class NotifyInviteRequest(TestCase): """let admins know of invite requests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """ensure there is one admin""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index 0da87f67b..239537df4 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -12,20 +12,20 @@ class ReadThrough(TestCase): """some activitypub oddness ahead""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """look, a shelf""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work + cls.work = models.Work.objects.create(title="Example Work") + cls.edition = models.Edition.objects.create( + title="Example Edition", parent_work=cls.work ) def test_valid_date(self): diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index dbb0ac8bb..ec9f751a4 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -15,10 +15,10 @@ class Relationship(TestCase): """following, blocking, stuff like that""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need some users for this""" with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -32,11 +32,11 @@ class Relationship(TestCase): patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.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, update_fields=["remote_id"]) + cls.local_user.remote_id = "http://local.com/user/mouse" + cls.local_user.save(broadcast=False, update_fields=["remote_id"]) def test_user_follows(self, *_): """basic functionality of user follows""" diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index 2d45dadbc..022cb5c61 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -16,18 +16,18 @@ class Shelf(TestCase): """some activitypub oddness ahead""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """look, a shelf""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create(title="test book", parent_work=work) + cls.book = models.Edition.objects.create(title="test book", parent_work=work) def test_remote_id(self, *_): """shelves use custom remote ids""" diff --git a/bookwyrm/tests/models/test_site.py b/bookwyrm/tests/models/test_site.py index 8cf15ad6f..0933dac0c 100644 --- a/bookwyrm/tests/models/test_site.py +++ b/bookwyrm/tests/models/test_site.py @@ -13,14 +13,14 @@ class SiteModels(TestCase): """tests for site models""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 32ccc2c57..bd2853595 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -25,18 +25,18 @@ class Status(TestCase): """lotta types of statuses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """useful things for creating a status""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -45,7 +45,7 @@ class Status(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="Test Edition") + cls.book = models.Edition.objects.create(title="Test Edition") def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index a47896269..22c7a171b 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -19,13 +19,13 @@ class User(TestCase): protocol = "https://" if USE_HTTPS else "http://" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( f"mouse@{DOMAIN}", "mouse@mouse.mouse", "mouseword", @@ -35,7 +35,7 @@ class User(TestCase): summary="a summary", bookwyrm_user=False, ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( f"nutria@{DOMAIN}", "nutria@nutria.nutria", "nutriaword", diff --git a/bookwyrm/tests/templatetags/test_book_display_tags.py b/bookwyrm/tests/templatetags/test_book_display_tags.py index 77d6fee54..40fa0f7d6 100644 --- a/bookwyrm/tests/templatetags/test_book_display_tags.py +++ b/bookwyrm/tests/templatetags/test_book_display_tags.py @@ -14,21 +14,21 @@ class BookDisplayTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse", ) - self.book = models.Edition.objects.create(title="Test Book") + cls.book = models.Edition.objects.create(title="Test Book") def test_get_book_description(self, *_): """grab it from the edition or the parent""" diff --git a/bookwyrm/tests/templatetags/test_feed_page_tags.py b/bookwyrm/tests/templatetags/test_feed_page_tags.py index 891bfc32c..7e3ba6a9f 100644 --- a/bookwyrm/tests/templatetags/test_feed_page_tags.py +++ b/bookwyrm/tests/templatetags/test_feed_page_tags.py @@ -13,21 +13,21 @@ class FeedPageTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse", ) - self.book = models.Edition.objects.create(title="Test Book") + cls.book = models.Edition.objects.create(title="Test Book") @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") def test_load_subclass(self, *_): diff --git a/bookwyrm/tests/templatetags/test_interaction.py b/bookwyrm/tests/templatetags/test_interaction.py index bd66575ff..6d707ffac 100644 --- a/bookwyrm/tests/templatetags/test_interaction.py +++ b/bookwyrm/tests/templatetags/test_interaction.py @@ -13,14 +13,14 @@ class InteractionTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", @@ -28,14 +28,14 @@ class InteractionTags(TestCase): localname="mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.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") + cls.book = models.Edition.objects.create(title="Test Book") def test_get_user_liked(self, *_): """did a user like a status""" diff --git a/bookwyrm/tests/templatetags/test_notification_page_tags.py b/bookwyrm/tests/templatetags/test_notification_page_tags.py index df2805828..2d18a5ca7 100644 --- a/bookwyrm/tests/templatetags/test_notification_page_tags.py +++ b/bookwyrm/tests/templatetags/test_notification_page_tags.py @@ -13,14 +13,14 @@ class NotificationPageTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", diff --git a/bookwyrm/tests/templatetags/test_rating_tags.py b/bookwyrm/tests/templatetags/test_rating_tags.py index f50236262..cb28fd788 100644 --- a/bookwyrm/tests/templatetags/test_rating_tags.py +++ b/bookwyrm/tests/templatetags/test_rating_tags.py @@ -13,14 +13,14 @@ class RatingTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", @@ -28,7 +28,7 @@ class RatingTags(TestCase): localname="mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.rat", "ratword", @@ -36,7 +36,7 @@ class RatingTags(TestCase): local=False, ) work = models.Work.objects.create(title="Work title") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Test Book", parent_work=work, ) diff --git a/bookwyrm/tests/templatetags/test_shelf_tags.py b/bookwyrm/tests/templatetags/test_shelf_tags.py index 47e86d9ef..8b3ec82d1 100644 --- a/bookwyrm/tests/templatetags/test_shelf_tags.py +++ b/bookwyrm/tests/templatetags/test_shelf_tags.py @@ -16,14 +16,14 @@ class ShelfTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", @@ -31,14 +31,14 @@ class ShelfTags(TestCase): localname="mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.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( + cls.book = models.Edition.objects.create( title="Test Book", parent_work=models.Work.objects.create(title="Test work"), ) diff --git a/bookwyrm/tests/templatetags/test_status_display.py b/bookwyrm/tests/templatetags/test_status_display.py index af125fd06..762f14ea8 100644 --- a/bookwyrm/tests/templatetags/test_status_display.py +++ b/bookwyrm/tests/templatetags/test_status_display.py @@ -15,14 +15,14 @@ class StatusDisplayTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", @@ -30,14 +30,14 @@ class StatusDisplayTags(TestCase): localname="mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.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") + cls.book = models.Edition.objects.create(title="Test Book") def test_get_mentions(self, *_): """list of people mentioned""" diff --git a/bookwyrm/tests/templatetags/test_utilities.py b/bookwyrm/tests/templatetags/test_utilities.py index 6fade22a7..bfd4f41ae 100644 --- a/bookwyrm/tests/templatetags/test_utilities.py +++ b/bookwyrm/tests/templatetags/test_utilities.py @@ -15,14 +15,14 @@ class UtilitiesTags(TestCase): """lotta different things here""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create some filler objects""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.mouse", "mouseword", @@ -30,15 +30,15 @@ class UtilitiesTags(TestCase): localname="mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.rat", "ratword", remote_id="http://example.com/rat", local=False, ) - self.author = models.Author.objects.create(name="Jessica", isni="4") - self.book = models.Edition.objects.create(title="Test Book") + cls.author = models.Author.objects.create(name="Jessica", isni="4") + cls.book = models.Edition.objects.create(title="Test Book") def test_get_uuid(self, *_): """uuid functionality""" diff --git a/bookwyrm/tests/test_context_processors.py b/bookwyrm/tests/test_context_processors.py index e5290f312..7a58b05d8 100644 --- a/bookwyrm/tests/test_context_processors.py +++ b/bookwyrm/tests/test_context_processors.py @@ -12,23 +12,23 @@ class ContextProcessor(TestCase): """pages you land on without really trying""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.anonymous_user = AnonymousUser - self.anonymous_user.is_authenticated = False - self.site = models.SiteSettings.objects.create() + cls.anonymous_user = AnonymousUser + cls.anonymous_user.is_authenticated = False + cls.site = models.SiteSettings.objects.create() def setUp(self): """other test data""" diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index 8a5b543d5..c507a059f 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -12,14 +12,14 @@ class Emailing(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 70f8e47cf..e41548bcf 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -36,24 +36,24 @@ class Signature(TestCase): """signature test""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create users and test data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.mouse = models.User.objects.create_user( + cls.mouse = models.User.objects.create_user( f"mouse@{DOMAIN}", "mouse@example.com", "", local=True, localname="mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( f"rat@{DOMAIN}", "rat@example.com", "", local=True, localname="rat" ) - self.cat = models.User.objects.create_user( + cls.cat = models.User.objects.create_user( f"cat@{DOMAIN}", "cat@example.com", "", local=True, localname="cat" ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/admin/test_announcements.py b/bookwyrm/tests/views/admin/test_announcements.py index 958d78fc4..62fb86d16 100644 --- a/bookwyrm/tests/views/admin/test_announcements.py +++ b/bookwyrm/tests/views/admin/test_announcements.py @@ -12,14 +12,14 @@ class AnnouncementViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/views/admin/test_automod.py b/bookwyrm/tests/views/admin/test_automod.py index 332410eba..27f98163e 100644 --- a/bookwyrm/tests/views/admin/test_automod.py +++ b/bookwyrm/tests/views/admin/test_automod.py @@ -16,14 +16,14 @@ class AutomodViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -33,7 +33,7 @@ class AutomodViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() def setUp(self): diff --git a/bookwyrm/tests/views/admin/test_celery.py b/bookwyrm/tests/views/admin/test_celery.py index 577d312b1..513d69944 100644 --- a/bookwyrm/tests/views/admin/test_celery.py +++ b/bookwyrm/tests/views/admin/test_celery.py @@ -15,14 +15,14 @@ class CeleryStatusViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,7 +32,7 @@ class CeleryStatusViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="admin") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() def setUp(self): diff --git a/bookwyrm/tests/views/admin/test_dashboard.py b/bookwyrm/tests/views/admin/test_dashboard.py index a68b046e3..35fcb25a4 100644 --- a/bookwyrm/tests/views/admin/test_dashboard.py +++ b/bookwyrm/tests/views/admin/test_dashboard.py @@ -15,14 +15,14 @@ class DashboardViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,7 +32,7 @@ class DashboardViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/admin/test_email_blocks.py b/bookwyrm/tests/views/admin/test_email_blocks.py index b37166d3c..08a131c3a 100644 --- a/bookwyrm/tests/views/admin/test_email_blocks.py +++ b/bookwyrm/tests/views/admin/test_email_blocks.py @@ -15,14 +15,14 @@ class EmailBlocklistViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,7 +32,7 @@ class EmailBlocklistViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/admin/test_email_config.py b/bookwyrm/tests/views/admin/test_email_config.py index 374c2402e..22f4b7a05 100644 --- a/bookwyrm/tests/views/admin/test_email_config.py +++ b/bookwyrm/tests/views/admin/test_email_config.py @@ -15,14 +15,14 @@ class EmailConfigViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,7 +32,7 @@ class EmailConfigViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="admin") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() def setUp(self): diff --git a/bookwyrm/tests/views/admin/test_federation.py b/bookwyrm/tests/views/admin/test_federation.py index 8244e8335..1d0012dde 100644 --- a/bookwyrm/tests/views/admin/test_federation.py +++ b/bookwyrm/tests/views/admin/test_federation.py @@ -18,14 +18,14 @@ class FederationViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -33,7 +33,7 @@ class FederationViews(TestCase): localname="mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -45,7 +45,7 @@ class FederationViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/admin/test_imports.py b/bookwyrm/tests/views/admin/test_imports.py index acb769546..211407ff6 100644 --- a/bookwyrm/tests/views/admin/test_imports.py +++ b/bookwyrm/tests/views/admin/test_imports.py @@ -15,14 +15,14 @@ class ImportsAdminViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,7 +32,7 @@ class ImportsAdminViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="admin") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() def setUp(self): diff --git a/bookwyrm/tests/views/admin/test_ip_blocklist.py b/bookwyrm/tests/views/admin/test_ip_blocklist.py index b34828622..491915eda 100644 --- a/bookwyrm/tests/views/admin/test_ip_blocklist.py +++ b/bookwyrm/tests/views/admin/test_ip_blocklist.py @@ -15,14 +15,14 @@ class IPBlocklistViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,7 +32,7 @@ class IPBlocklistViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/admin/test_link_domains.py b/bookwyrm/tests/views/admin/test_link_domains.py index fabb7511a..20d28896f 100644 --- a/bookwyrm/tests/views/admin/test_link_domains.py +++ b/bookwyrm/tests/views/admin/test_link_domains.py @@ -15,14 +15,14 @@ class LinkDomainViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,13 +32,13 @@ class LinkDomainViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) - self.book = models.Edition.objects.create(title="hello") + cls.book = models.Edition.objects.create(title="hello") models.FileLink.objects.create( - book=self.book, + book=cls.book, url="https://beep.com/book/1", - added_by=self.local_user, + added_by=cls.local_user, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py index 7ce665451..146e40a9b 100644 --- a/bookwyrm/tests/views/admin/test_reports.py +++ b/bookwyrm/tests/views/admin/test_reports.py @@ -16,21 +16,21 @@ class ReportViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@local.com", "rat@mouse.mouse", "password", @@ -40,7 +40,7 @@ class ReportViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() def setUp(self): diff --git a/bookwyrm/tests/views/admin/test_site.py b/bookwyrm/tests/views/admin/test_site.py index ec5b07e3a..277bfbc85 100644 --- a/bookwyrm/tests/views/admin/test_site.py +++ b/bookwyrm/tests/views/admin/test_site.py @@ -15,14 +15,14 @@ class SiteSettingsViews(TestCase): """Edit site settings""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -32,9 +32,9 @@ class SiteSettingsViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="admin") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) - self.site = models.SiteSettings.objects.create() + cls.site = models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_themes.py b/bookwyrm/tests/views/admin/test_themes.py index b931ea561..af46bf060 100644 --- a/bookwyrm/tests/views/admin/test_themes.py +++ b/bookwyrm/tests/views/admin/test_themes.py @@ -16,21 +16,21 @@ class AdminThemesViews(TestCase): """Edit site settings""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", @@ -40,9 +40,9 @@ class AdminThemesViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="admin") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) - self.site = models.SiteSettings.objects.create() + cls.site = models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_user_admin.py b/bookwyrm/tests/views/admin/test_user_admin.py index 5247ff70f..48fd7202e 100644 --- a/bookwyrm/tests/views/admin/test_user_admin.py +++ b/bookwyrm/tests/views/admin/test_user_admin.py @@ -16,14 +16,14 @@ class UserAdminViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -33,7 +33,7 @@ class UserAdminViews(TestCase): initdb.init_groups() initdb.init_permissions() group = Group.objects.get(name="moderator") - self.local_user.groups.set([group]) + cls.local_user.groups.set([group]) models.SiteSettings.objects.create() def setUp(self): diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index 68a114fb9..cb66811a1 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -24,14 +24,14 @@ class BookViews(TestCase): """books books books""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -39,19 +39,19 @@ class BookViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.group = Group.objects.create(name="editor") - self.group.permissions.add( + cls.group = Group.objects.create(name="editor") + cls.group.permissions.add( Permission.objects.create( name="edit_book", codename="edit_book", content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index 0bd962de5..05a4d68ac 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -20,14 +20,14 @@ class EditBookViews(TestCase): """books books books""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -35,19 +35,19 @@ class EditBookViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.group = Group.objects.create(name="editor") - self.group.permissions.add( + cls.group = Group.objects.create(name="editor") + cls.group.permissions.add( Permission.objects.create( name="edit_book", codename="edit_book", content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py index b829d471b..ef7404e51 100644 --- a/bookwyrm/tests/views/books/test_editions.py +++ b/bookwyrm/tests/views/books/test_editions.py @@ -14,14 +14,14 @@ class BookViews(TestCase): """books books books""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -29,11 +29,11 @@ class BookViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, physical_format="paperback", ) diff --git a/bookwyrm/tests/views/books/test_links.py b/bookwyrm/tests/views/books/test_links.py index d1040a591..299dea484 100644 --- a/bookwyrm/tests/views/books/test_links.py +++ b/bookwyrm/tests/views/books/test_links.py @@ -16,13 +16,13 @@ class LinkViews(TestCase): """books books books""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -38,13 +38,13 @@ class LinkViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.local_user.groups.add(group) + cls.local_user.groups.add(group) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/imports/test_import.py b/bookwyrm/tests/views/imports/test_import.py index c3b2795b1..658d95a33 100644 --- a/bookwyrm/tests/views/imports/test_import.py +++ b/bookwyrm/tests/views/imports/test_import.py @@ -17,14 +17,14 @@ class ImportViews(TestCase): """goodreads import views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/views/imports/test_import_review.py b/bookwyrm/tests/views/imports/test_import_review.py index 5da02a56a..026efac11 100644 --- a/bookwyrm/tests/views/imports/test_import_review.py +++ b/bookwyrm/tests/views/imports/test_import_review.py @@ -12,14 +12,14 @@ class ImportManualReviewViews(TestCase): """goodreads import views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -27,10 +27,10 @@ class ImportManualReviewViews(TestCase): localname="mouse", ) models.SiteSettings.objects.create() - self.job = models.ImportJob.objects.create(user=self.local_user, mappings={}) + cls.job = models.ImportJob.objects.create(user=cls.local_user, mappings={}) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/views/imports/test_import_troubleshoot.py b/bookwyrm/tests/views/imports/test_import_troubleshoot.py index 9ddc99785..2e76da373 100644 --- a/bookwyrm/tests/views/imports/test_import_troubleshoot.py +++ b/bookwyrm/tests/views/imports/test_import_troubleshoot.py @@ -13,14 +13,14 @@ class ImportTroubleshootViews(TestCase): """goodreads import views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index af85e84d4..92ee8a43d 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -29,7 +29,7 @@ class Inbox(TestCase): } @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), @@ -46,7 +46,7 @@ class Inbox(TestCase): 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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 2bd5faf6a..0a11053e4 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -12,7 +12,7 @@ class InboxAdd(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), @@ -29,7 +29,7 @@ class InboxAdd(TestCase): 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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -40,7 +40,7 @@ class InboxAdd(TestCase): ) work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Test", remote_id="https://example.com/book/37292", parent_work=work, diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index d982a91c8..d499629a7 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -12,24 +12,24 @@ class InboxActivities(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -43,8 +43,8 @@ class InboxActivities(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.activitystreams.add_status_task.delay"), ): - self.status = models.Status.objects.create( - user=self.local_user, + cls.status = models.Status.objects.create( + user=cls.local_user, content="Test status", remote_id="https://example.com/status/1", ) diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 9cdf7eba3..19b0eb97f 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -11,24 +11,24 @@ class InboxBlock(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 7f5be5b65..e8a3a8b12 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -74,24 +74,24 @@ class InboxCreate(TestCase): """readthrough tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 9c2b589e2..a72898857 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -12,24 +12,24 @@ class InboxActivities(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -39,8 +39,8 @@ class InboxActivities(TestCase): outbox="https://example.com/users/rat/outbox", ) with patch("bookwyrm.activitystreams.add_status_task.delay"): - self.status = models.Status.objects.create( - user=self.remote_user, + cls.status = models.Status.objects.create( + user=cls.remote_user, content="Test status", remote_id="https://example.com/status/1", ) diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index 8ccffe1db..aad52937b 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -12,24 +12,24 @@ class InboxRelationships(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index 4efe4cb98..2ab8c4701 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -11,24 +11,24 @@ class InboxActivities(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -42,8 +42,8 @@ class InboxActivities(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.activitystreams.add_status_task.delay"), ): - self.status = models.Status.objects.create( - user=self.local_user, + cls.status = models.Status.objects.create( + user=cls.local_user, content="Test status", remote_id="https://example.com/status/1", ) diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index f0be2b17a..ab92eb995 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -11,24 +11,24 @@ class InboxRemove(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -38,11 +38,11 @@ class InboxRemove(TestCase): outbox="https://example.com/users/rat/outbox", ) - self.work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="work title") + cls.book = models.Edition.objects.create( title="Test", remote_id="https://bookwyrm.social/book/37292", - parent_work=self.work, + parent_work=cls.work, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index fb2c85a88..99f4c2077 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -13,24 +13,24 @@ class InboxUpdate(TestCase): """inbox tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@example.com", "mouse@mouse.com", "mouseword", local=True, localname="mouse", ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False, update_fields=["remote_id"]) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.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( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/views/landing/test_invite.py b/bookwyrm/tests/views/landing/test_invite.py index 5a76f578b..8adc64f4f 100644 --- a/bookwyrm/tests/views/landing/test_invite.py +++ b/bookwyrm/tests/views/landing/test_invite.py @@ -15,14 +15,14 @@ class InviteViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/views/landing/test_landing.py b/bookwyrm/tests/views/landing/test_landing.py index c0581d893..c68c9cd53 100644 --- a/bookwyrm/tests/views/landing/test_landing.py +++ b/bookwyrm/tests/views/landing/test_landing.py @@ -15,14 +15,14 @@ class LandingViews(TestCase): """pages you land on without really trying""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/views/landing/test_login.py b/bookwyrm/tests/views/landing/test_login.py index 283890e3e..7d4a06612 100644 --- a/bookwyrm/tests/views/landing/test_login.py +++ b/bookwyrm/tests/views/landing/test_login.py @@ -18,14 +18,14 @@ class LoginViews(TestCase): """login and password management""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.com", "password", @@ -33,14 +33,14 @@ class LoginViews(TestCase): localname="mouse", two_factor_auth=False, ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@your.domain.here", "rat@rat.com", "password", local=True, localname="rat", ) - self.badger = models.User.objects.create_user( + cls.badger = models.User.objects.create_user( "badger@your.domain.here", "badger@badger.com", "password", diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py index 8f322b3cb..ad3110b02 100644 --- a/bookwyrm/tests/views/landing/test_password.py +++ b/bookwyrm/tests/views/landing/test_password.py @@ -17,14 +17,14 @@ class PasswordViews(TestCase): """view user and edit profile""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "password", diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py index 4b3d46673..7db6775db 100644 --- a/bookwyrm/tests/views/landing/test_register.py +++ b/bookwyrm/tests/views/landing/test_register.py @@ -21,21 +21,21 @@ class RegisterViews(TestCase): """login and password management""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.com", "password", local=True, localname="mouse", ) - self.settings = models.SiteSettings.objects.create( + cls.settings = models.SiteSettings.objects.create( id=1, require_confirm_email=False, allow_registration=True ) diff --git a/bookwyrm/tests/views/lists/test_curate.py b/bookwyrm/tests/views/lists/test_curate.py index 59d73cefd..af6116efa 100644 --- a/bookwyrm/tests/views/lists/test_curate.py +++ b/bookwyrm/tests/views/lists/test_curate.py @@ -16,14 +16,14 @@ class ListViews(TestCase): """list view""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -32,7 +32,7 @@ class ListViews(TestCase): remote_id="https://example.com/users/mouse", ) work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, @@ -42,9 +42,7 @@ class ListViews(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.lists_stream.remove_list_task.delay"), ): - self.list = models.List.objects.create( - name="Test List", user=self.local_user - ) + cls.list = models.List.objects.create(name="Test List", user=cls.local_user) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/lists/test_embed.py b/bookwyrm/tests/views/lists/test_embed.py index 9c1d3846d..2d2d5ec8c 100644 --- a/bookwyrm/tests/views/lists/test_embed.py +++ b/bookwyrm/tests/views/lists/test_embed.py @@ -16,14 +16,14 @@ class ListViews(TestCase): """list view""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -32,7 +32,7 @@ class ListViews(TestCase): remote_id="https://example.com/users/mouse", ) work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, @@ -42,9 +42,7 @@ class ListViews(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.lists_stream.remove_list_task.delay"), ): - self.list = models.List.objects.create( - name="Test List", user=self.local_user - ) + cls.list = models.List.objects.create(name="Test List", user=cls.local_user) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index dc144c134..6af9d1db1 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -19,14 +19,14 @@ class ListViews(TestCase): """list view""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -34,7 +34,7 @@ class ListViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@local.com", "rat@rat.com", "ratword", @@ -43,25 +43,25 @@ class ListViews(TestCase): remote_id="https://example.com/users/rat", ) work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( + cls.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( + cls.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( + cls.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( + cls.book_four = models.Edition.objects.create( title="Example Edition 4", remote_id="https://example.com/book/4", parent_work=work_four, @@ -71,9 +71,7 @@ class ListViews(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.lists_stream.remove_list_task.delay"), ): - self.list = models.List.objects.create( - name="Test List", user=self.local_user - ) + cls.list = models.List.objects.create(name="Test List", user=cls.local_user) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/lists/test_list_item.py b/bookwyrm/tests/views/lists/test_list_item.py index e265d7ef5..e70eabf1b 100644 --- a/bookwyrm/tests/views/lists/test_list_item.py +++ b/bookwyrm/tests/views/lists/test_list_item.py @@ -13,14 +13,14 @@ class ListItemViews(TestCase): """list view""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -29,7 +29,7 @@ class ListItemViews(TestCase): remote_id="https://example.com/users/mouse", ) work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, @@ -38,9 +38,7 @@ class ListItemViews(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.lists_stream.remove_list_task.delay"), ): - self.list = models.List.objects.create( - name="Test List", user=self.local_user - ) + cls.list = models.List.objects.create(name="Test List", user=cls.local_user) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/lists/test_lists.py b/bookwyrm/tests/views/lists/test_lists.py index 88ea71360..069fd7008 100644 --- a/bookwyrm/tests/views/lists/test_lists.py +++ b/bookwyrm/tests/views/lists/test_lists.py @@ -16,14 +16,14 @@ class ListViews(TestCase): """lists of lists""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -31,7 +31,7 @@ class ListViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "rat@local.com", "rat@rat.com", "ratword", local=True, localname="rat" ) diff --git a/bookwyrm/tests/views/preferences/test_block.py b/bookwyrm/tests/views/preferences/test_block.py index bc39d2f62..e20888659 100644 --- a/bookwyrm/tests/views/preferences/test_block.py +++ b/bookwyrm/tests/views/preferences/test_block.py @@ -14,14 +14,14 @@ class BlockViews(TestCase): """view user and edit profile""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", @@ -29,7 +29,7 @@ class BlockViews(TestCase): localname="mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", diff --git a/bookwyrm/tests/views/preferences/test_change_password.py b/bookwyrm/tests/views/preferences/test_change_password.py index 1717204bd..75a17e462 100644 --- a/bookwyrm/tests/views/preferences/test_change_password.py +++ b/bookwyrm/tests/views/preferences/test_change_password.py @@ -13,14 +13,14 @@ class ChangePasswordViews(TestCase): """view user and edit profile""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "password", diff --git a/bookwyrm/tests/views/preferences/test_delete_user.py b/bookwyrm/tests/views/preferences/test_delete_user.py index 94d8c4a69..34ab52be4 100644 --- a/bookwyrm/tests/views/preferences/test_delete_user.py +++ b/bookwyrm/tests/views/preferences/test_delete_user.py @@ -17,21 +17,21 @@ class DeleteUserViews(TestCase): """view user and edit profile""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@your.domain.here", "rat@rat.rat", "password", @@ -39,7 +39,7 @@ class DeleteUserViews(TestCase): localname="rat", ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="test", parent_work=models.Work.objects.create(title="test work") ) with ( @@ -47,9 +47,9 @@ class DeleteUserViews(TestCase): patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), ): models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.first(), + book=cls.book, + user=cls.local_user, + shelf=cls.local_user.shelf_set.first(), ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/preferences/test_edit_user.py b/bookwyrm/tests/views/preferences/test_edit_user.py index 4b83f3b80..7872e8f6e 100644 --- a/bookwyrm/tests/views/preferences/test_edit_user.py +++ b/bookwyrm/tests/views/preferences/test_edit_user.py @@ -19,25 +19,25 @@ class EditUserViews(TestCase): """view user and edit profile""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="test", parent_work=models.Work.objects.create(title="test work") ) with ( @@ -45,9 +45,9 @@ class EditUserViews(TestCase): patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), ): models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.first(), + book=cls.book, + user=cls.local_user, + shelf=cls.local_user.shelf_set.first(), ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/preferences/test_export.py b/bookwyrm/tests/views/preferences/test_export.py index 128b8fc8b..f125e9009 100644 --- a/bookwyrm/tests/views/preferences/test_export.py +++ b/bookwyrm/tests/views/preferences/test_export.py @@ -18,15 +18,13 @@ class ExportViews(TestCase): """viewing and creating statuses""" @classmethod - def setUpTestData( - self, - ): # pylint: disable=bad-classmethod-argument, disable=invalid-name + def setUpTestData(cls): # pylint: disable=invalid-name """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -34,11 +32,11 @@ class ExportViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Test Book", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, isbn_13="9781234567890", bnf_id="beep", ) diff --git a/bookwyrm/tests/views/preferences/test_two_factor_auth.py b/bookwyrm/tests/views/preferences/test_two_factor_auth.py index 8eb5e92c7..3b16236ed 100644 --- a/bookwyrm/tests/views/preferences/test_two_factor_auth.py +++ b/bookwyrm/tests/views/preferences/test_two_factor_auth.py @@ -18,14 +18,14 @@ class TwoFactorViews(TestCase): """Two Factor Authentication management""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@your.domain.here", "mouse@mouse.com", "password", diff --git a/bookwyrm/tests/views/shelf/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py index 57631974f..9c2b0a645 100644 --- a/bookwyrm/tests/views/shelf/test_shelf.py +++ b/bookwyrm/tests/views/shelf/test_shelf.py @@ -21,14 +21,14 @@ class ShelfViews(TestCase): """tag views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -36,15 +36,15 @@ class ShelfViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - self.shelf = models.Shelf.objects.create( - name="Test Shelf", identifier="test-shelf", user=self.local_user + cls.shelf = models.Shelf.objects.create( + name="Test Shelf", identifier="test-shelf", user=cls.local_user ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py index ee5854d18..d4727d9c5 100644 --- a/bookwyrm/tests/views/shelf/test_shelf_actions.py +++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py @@ -19,14 +19,14 @@ class ShelfActionViews(TestCase): """tag views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -34,7 +34,7 @@ class ShelfActionViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "rat@local.com", "rat@rat.com", "ratword", @@ -42,15 +42,15 @@ class ShelfActionViews(TestCase): localname="rat", remote_id="https://example.com/users/rat", ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - self.shelf = models.Shelf.objects.create( - name="Test Shelf", identifier="test-shelf", user=self.local_user + cls.shelf = models.Shelf.objects.create( + name="Test Shelf", identifier="test-shelf", user=cls.local_user ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_annual_summary.py b/bookwyrm/tests/views/test_annual_summary.py index 2fd7dc4eb..db8389fc6 100644 --- a/bookwyrm/tests/views/test_annual_summary.py +++ b/bookwyrm/tests/views/test_annual_summary.py @@ -22,14 +22,14 @@ class AnnualSummary(TestCase): """views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -38,11 +38,11 @@ class AnnualSummary(TestCase): remote_id="https://example.com/users/mouse", summary_keys={"2020": "0123456789"}, ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, pages=300, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index bee057d0c..ed65fc30b 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -17,14 +17,14 @@ class AuthorViews(TestCase): """author views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -32,19 +32,19 @@ class AuthorViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.group = Group.objects.create(name="editor") - self.group.permissions.add( + cls.group = Group.objects.create(name="editor") + cls.group.permissions.add( Permission.objects.create( name="edit_book", codename="edit_book", content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index e2bef539e..a169551ac 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -14,14 +14,14 @@ class DirectoryViews(TestCase): """tag views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py index 937039592..15732b924 100644 --- a/bookwyrm/tests/views/test_discover.py +++ b/bookwyrm/tests/views/test_discover.py @@ -12,14 +12,14 @@ class DiscoverViews(TestCase): """pages you land on without really trying""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index fb2609575..a57be1023 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -25,28 +25,28 @@ class FeedViews(TestCase): """activity feed, statuses, dms""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "nutria@local.com", "nutria@nutria.nutria", "password", local=True, localname="nutria", ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( parent_work=models.Work.objects.create(title="hi"), title="Example Edition", remote_id="https://example.com/book/1", diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index 61a0a82ce..c26a9372a 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -18,7 +18,7 @@ class FollowViews(TestCase): """follows""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" models.SiteSettings.objects.create() with ( @@ -26,7 +26,7 @@ class FollowViews(TestCase): patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -35,7 +35,7 @@ class FollowViews(TestCase): remote_id="https://example.com/users/mouse", ) with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@email.com", "ratword", @@ -44,19 +44,19 @@ class FollowViews(TestCase): 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( + cls.group = Group.objects.create(name="editor") + cls.group.permissions.add( Permission.objects.create( name="edit_book", codename="edit_book", content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) def setUp(self): diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 5d6aa8782..b33948c19 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -13,28 +13,28 @@ class GetStartedViews(TestCase): """helping new users get oriented""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat", ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( parent_work=models.Work.objects.create(title="hi"), title="Example Edition", remote_id="https://example.com/book/1", diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index 49227457b..d682b727d 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -16,14 +16,14 @@ class GoalViews(TestCase): """viewing and creating statuses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -31,7 +31,7 @@ class GoalViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@local.com", "rat@rat.com", "ratword", @@ -39,7 +39,7 @@ class GoalViews(TestCase): localname="rat", remote_id="https://example.com/users/rat", ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", ) diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py index ca9284686..90223f74a 100644 --- a/bookwyrm/tests/views/test_group.py +++ b/bookwyrm/tests/views/test_group.py @@ -17,21 +17,21 @@ class GroupViews(TestCase): """view group and edit details""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", @@ -39,14 +39,14 @@ class GroupViews(TestCase): localname="rat", ) - self.testgroup = models.Group.objects.create( + cls.testgroup = models.Group.objects.create( name="Test Group", description="Initial description", - user=self.local_user, + user=cls.local_user, privacy="public", ) - self.membership = models.GroupMember.objects.create( - group=self.testgroup, user=self.local_user + cls.membership = models.GroupMember.objects.create( + group=cls.testgroup, user=cls.local_user ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_hashtag.py b/bookwyrm/tests/views/test_hashtag.py index 5979238d8..d9679fe5a 100644 --- a/bookwyrm/tests/views/test_hashtag.py +++ b/bookwyrm/tests/views/test_hashtag.py @@ -15,13 +15,13 @@ class HashtagView(TestCase): """hashtag view""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -29,7 +29,7 @@ class HashtagView(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.follower_user = models.User.objects.create_user( + cls.follower_user = models.User.objects.create_user( "follower@local.com", "follower@email.com", "followerword", @@ -37,8 +37,8 @@ class HashtagView(TestCase): localname="follower", remote_id="https://example.com/users/follower", ) - self.local_user.followers.add(self.follower_user) - self.other_user = models.User.objects.create_user( + cls.local_user.followers.add(cls.follower_user) + cls.other_user = models.User.objects.create_user( "other@local.com", "other@email.com", "otherword", @@ -47,25 +47,25 @@ class HashtagView(TestCase): remote_id="https://example.com/users/other", ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) - self.hashtag_bookclub = models.Hashtag.objects.create(name="#BookClub") + cls.hashtag_bookclub = models.Hashtag.objects.create(name="#BookClub") with ( patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.activitystreams.add_status_task.delay"), ): - self.statuses_bookclub = [ + cls.statuses_bookclub = [ models.Comment.objects.create( - book=self.book, user=self.local_user, content="#BookClub" + book=cls.book, user=cls.local_user, content="#BookClub" ), ] - for status in self.statuses_bookclub: - status.mention_hashtags.add(self.hashtag_bookclub) + for status in cls.statuses_bookclub: + status.mention_hashtags.add(cls.hashtag_bookclub) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index e00e1d234..818647db1 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -19,7 +19,7 @@ class ViewsHelpers(TestCase): # pylint: disable=too-many-public-methods """viewing and creating statuses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), @@ -27,7 +27,7 @@ class ViewsHelpers(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.lists_stream.populate_lists_task.delay"), patch("bookwyrm.suggested_users.rerank_user_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -40,7 +40,7 @@ class ViewsHelpers(TestCase): # pylint: disable=too-many-public-methods patch("bookwyrm.models.user.set_remote_server.delay"), patch("bookwyrm.suggested_users.rerank_user_task.delay"), ): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -50,15 +50,15 @@ class ViewsHelpers(TestCase): # pylint: disable=too-many-public-methods 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( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Test Book", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - self.shelf = models.Shelf.objects.create( - name="Test Shelf", identifier="test-shelf", user=self.local_user + cls.shelf = models.Shelf.objects.create( + name="Test Shelf", identifier="test-shelf", user=cls.local_user ) def setUp(self): diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 95d7b5791..d1533c451 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -13,14 +13,14 @@ class InteractionViews(TestCase): """viewing and creating statuses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -29,7 +29,7 @@ class InteractionViews(TestCase): remote_id="https://example.com/users/mouse", ) with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@email.com", "ratword", @@ -39,7 +39,7 @@ class InteractionViews(TestCase): outbox="https://example.com/users/rat/outbox", ) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index bb66c8f3e..632a831b0 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -15,14 +15,14 @@ class IsbnViews(TestCase): """tag views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -30,12 +30,12 @@ class IsbnViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Test Book", isbn_13="1234567890123", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index c44940742..878a64c2c 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -13,27 +13,25 @@ class NotificationViews(TestCase): """notifications""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - self.status = models.Status.objects.create( - content="hi", user=self.local_user - ) + cls.status = models.Status.objects.create(content="hi", user=cls.local_user) models.SiteSettings.objects.create() def setUp(self): diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py index ca289db3f..b21d56c83 100644 --- a/bookwyrm/tests/views/test_outbox.py +++ b/bookwyrm/tests/views/test_outbox.py @@ -16,14 +16,14 @@ class OutboxView(TestCase): """sends out activities""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we'll need some data""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -32,7 +32,7 @@ class OutboxView(TestCase): remote_id="https://example.com/users/mouse", ) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index 39c611d6c..139d91820 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -16,14 +16,14 @@ class ReadingViews(TestCase): """viewing and creating statuses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -32,7 +32,7 @@ class ReadingViews(TestCase): remote_id="https://example.com/users/mouse", ) with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@rat.com", "ratword", @@ -41,11 +41,11 @@ class ReadingViews(TestCase): 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( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Test Book", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) def setUp(self): diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index 113b3161d..c71ee6c58 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -16,12 +16,12 @@ class ReadThrough(TestCase): """readthrough tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """basic user and book data""" - self.work = models.Work.objects.create(title="Example Work") + cls.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work + cls.edition = models.Edition.objects.create( + title="Example Edition", parent_work=cls.work ) with ( @@ -29,7 +29,7 @@ class ReadThrough(TestCase): patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" ) diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py index 65670dcbf..f07887bfe 100644 --- a/bookwyrm/tests/views/test_report.py +++ b/bookwyrm/tests/views/test_report.py @@ -12,21 +12,21 @@ class ReportViews(TestCase): """every response to a get request, html or json""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@local.com", "rat@mouse.mouse", "password", @@ -37,8 +37,8 @@ class ReportViews(TestCase): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.activitystreams.add_status_task.delay"), ): - self.status = models.Status.objects.create( - user=self.local_user, + cls.status = models.Status.objects.create( + user=cls.local_user, content="Test status", ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index af5ad5301..790efe51b 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -13,17 +13,17 @@ class RssFeedView(TestCase): """rss feed behaves as expected""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "rss_user", "rss@test.rss", "password", local=True ) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 5e06e6f81..64ff68ba8 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -18,14 +18,14 @@ class Views(TestCase): """tag views""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -33,11 +33,11 @@ class Views(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( title="Test Book", remote_id="https://example.com/book/1", - parent_work=self.work, + parent_work=cls.work, ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index f5fe515f1..52582a235 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -77,14 +77,14 @@ class StatusViews(TestCase): """viewing and creating statuses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.com", "mouseword", @@ -92,16 +92,16 @@ class StatusViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - self.another_user = models.User.objects.create_user( + cls.another_user = models.User.objects.create_user( f"nutria@{DOMAIN}", "nutria@nutria.com", "password", local=True, localname="nutria", ) - self.existing_hashtag = models.Hashtag.objects.create(name="#existing") + cls.existing_hashtag = models.Hashtag.objects.create(name="#existing") with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( + cls.remote_user = models.User.objects.create_user( "rat", "rat@email.com", "ratword", @@ -111,7 +111,7 @@ class StatusViews(TestCase): outbox="https://example.com/users/rat/outbox", ) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index 6f826b46f..7230f3324 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -13,14 +13,14 @@ class UpdateViews(TestCase): """lets the ui check for unread notification""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 4b49f120e..362d04feb 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -16,24 +16,24 @@ class UserViews(TestCase): """view user and edit profile""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", local=True, localname="mouse", ) - self.rat = models.User.objects.create_user( + cls.rat = models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="test", parent_work=models.Work.objects.create(title="test work") ) with ( @@ -42,9 +42,9 @@ class UserViews(TestCase): patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), ): models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.first(), + book=cls.book, + user=cls.local_user, + shelf=cls.local_user.shelf_set.first(), ) models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index d8bf0d062..444d88d17 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -14,14 +14,14 @@ class WellknownViews(TestCase): """view user and edit profile""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.local_user = models.User.objects.create_user( + cls.local_user = models.User.objects.create_user( "mouse@local.com", "mouse@mouse.mouse", "password", From 90bd8935689274aa9b3c54a1eb1f509309ae004a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 17 Mar 2024 21:00:48 -0300 Subject: [PATCH 109/200] Fix remaining instances of `bad-classmethod-argument` --- bookwyrm/tests/activitypub/test_author.py | 6 +++--- bookwyrm/tests/activitypub/test_quotation.py | 6 +++--- .../tests/connectors/test_abstract_connector.py | 4 ++-- .../test_abstract_minimal_connector.py | 4 ++-- .../tests/connectors/test_bookwyrm_connector.py | 2 +- .../tests/connectors/test_connector_manager.py | 12 ++++++------ .../connectors/test_openlibrary_connector.py | 2 +- bookwyrm/tests/models/test_book_model.py | 12 ++++++------ bookwyrm/tests/test_book_search.py | 16 ++++++++-------- bookwyrm/tests/views/test_setup.py | 4 ++-- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py index 7579909a8..7f21e570c 100644 --- a/bookwyrm/tests/activitypub/test_author.py +++ b/bookwyrm/tests/activitypub/test_author.py @@ -7,13 +7,13 @@ class Author(TestCase): """serialize author tests""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """initial data""" - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", ) - self.author = models.Author.objects.create( + cls.author = models.Author.objects.create( name="Author fullname", aliases=["One", "Two"], bio="bio bio bio", diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index 9a0867c52..50aeb5834 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -11,10 +11,10 @@ class Quotation(TestCase): """we have hecka ways to create statuses""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """model objects we'll need""" with patch("bookwyrm.models.user.set_remote_server.delay"): - self.user = models.User.objects.create_user( + cls.user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", @@ -23,7 +23,7 @@ class Quotation(TestCase): outbox="https://example.com/user/mouse/outbox", remote_id="https://example.com/user/mouse", ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", ) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index b43966d6a..994286994 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -13,7 +13,7 @@ class AbstractConnector(TestCase): """generic code for connecting to outside data sources""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need an example connector in the database""" models.Connector.objects.create( identifier="example.com", @@ -23,7 +23,7 @@ class AbstractConnector(TestCase): covers_url="https://example.com/covers", search_url="https://example.com/search?q=", ) - self.book = models.Edition.objects.create( + cls.book = models.Edition.objects.create( title="Test Book", remote_id="https://example.com/book/1234", openlibrary_key="OL1234M", diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py index 73399649e..cbbecf652 100644 --- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py @@ -10,9 +10,9 @@ class AbstractConnector(TestCase): """generic code for connecting to outside data sources""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need an example connector in the database""" - self.connector_info = models.Connector.objects.create( + cls.connector_info = models.Connector.objects.create( identifier="example.com", connector_file="openlibrary", base_url="https://example.com", diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py index 553901655..9a909aa8a 100644 --- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py +++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py @@ -12,7 +12,7 @@ class BookWyrmConnector(TestCase): """this connector doesn't do much, just search""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """create bookwrym_connector in the database""" models.Connector.objects.create( identifier="example.com", diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py index cc01f1116..7c9512ced 100644 --- a/bookwyrm/tests/connectors/test_connector_manager.py +++ b/bookwyrm/tests/connectors/test_connector_manager.py @@ -11,18 +11,18 @@ class ConnectorManager(TestCase): """interface between the app and various connectors""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we'll need some books and a connector info entry""" - self.work = models.Work.objects.create(title="Example Work") + cls.work = models.Work.objects.create(title="Example Work") models.Edition.objects.create( - title="Example Edition", parent_work=self.work, isbn_10="0000000000" + title="Example Edition", parent_work=cls.work, isbn_10="0000000000" ) - self.edition = models.Edition.objects.create( - title="Another Edition", parent_work=self.work, isbn_10="1111111111" + cls.edition = models.Edition.objects.create( + title="Another Edition", parent_work=cls.work, isbn_10="1111111111" ) - self.remote_connector = models.Connector.objects.create( + cls.remote_connector = models.Connector.objects.create( identifier="test_connector_remote", priority=1, connector_file="bookwyrm_connector", diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 487356400..72bac4244 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -19,7 +19,7 @@ class Openlibrary(TestCase): """test loading data from openlibrary.org""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """creates the connector in the database""" models.Connector.objects.create( identifier="openlibrary.org", diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index c6b854180..c40c94294 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -19,17 +19,17 @@ class Book(TestCase): """not too much going on in the books model but here we are""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we'll need some books""" - self.work = models.Work.objects.create( + cls.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 + cls.first_edition = models.Edition.objects.create( + title="Example Edition", parent_work=cls.work ) - self.second_edition = models.Edition.objects.create( + cls.second_edition = models.Edition.objects.create( title="Another Example Edition", - parent_work=self.work, + parent_work=cls.work, ) def test_remote_id(self): diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index d2056bfeb..4663d1cdc 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -11,27 +11,27 @@ class BookSearch(TestCase): """look for some books""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" - self.work = models.Work.objects.create(title="Example Work") + cls.work = models.Work.objects.create(title="Example Work") - self.first_edition = models.Edition.objects.create( + cls.first_edition = models.Edition.objects.create( title="Example Edition", - parent_work=self.work, + parent_work=cls.work, isbn_10="0000000000", physical_format="Paperback", published_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc), ) - self.second_edition = models.Edition.objects.create( + cls.second_edition = models.Edition.objects.create( title="Another Edition", - parent_work=self.work, + parent_work=cls.work, isbn_10="1111111111", openlibrary_key="hello", pages=150, ) - self.third_edition = models.Edition.objects.create( + cls.third_edition = models.Edition.objects.create( title="Another Edition with annoying ISBN", - parent_work=self.work, + parent_work=cls.work, isbn_10="022222222X", ) diff --git a/bookwyrm/tests/views/test_setup.py b/bookwyrm/tests/views/test_setup.py index d2bdba340..7547b5646 100644 --- a/bookwyrm/tests/views/test_setup.py +++ b/bookwyrm/tests/views/test_setup.py @@ -14,9 +14,9 @@ class SetupViews(TestCase): """activity feed, statuses, dms""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(cls): """we need basic test data and mocks""" - self.site = models.SiteSettings.objects.create(install_mode=True) + cls.site = models.SiteSettings.objects.create(install_mode=True) def setUp(self): """individual test setup""" From beb49af51492e310c433eb4ed23bb947fc52787e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 17 Mar 2024 21:46:34 -0300 Subject: [PATCH 110/200] Upgade django-pgtrigger to 4.11 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 05fd9d2b4..90ff18edb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ django-celery-beat==2.4.0 django-compressor==4.3.1 django-imagekit==4.1.0 django-model-utils==4.3.1 -django-pgtrigger==4.10.0 +django-pgtrigger==4.11.0 django-sass-processor==1.2.2 django-csp==3.7 environs==9.5.0 From 2cf7ed477df2dddefa899a0feaca9e917f2b4738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Sun, 17 Mar 2024 22:37:28 -0300 Subject: [PATCH 111/200] Consolidate test_posgres.py into test_book_search.py These are tests I missed when first writing trigger tests in test_book_search.py. --- bookwyrm/tests/test_book_search.py | 60 ++++++++++++++++++++++- bookwyrm/tests/test_postgres.py | 77 ------------------------------ 2 files changed, 58 insertions(+), 79 deletions(-) delete mode 100644 bookwyrm/tests/test_postgres.py diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index 439d2edbf..0721cb142 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -184,11 +184,67 @@ class SearchVectorTest(TestCase): book = self._create_book("Hear We Come", "John") self.assertEqual(book.search_vector, "'come':3A 'hear':1A 'john':4C") + book = self._create_book("there there", "the") + self.assertEqual(book.search_vector, "'the':3C 'there':1A,2A") + def test_search_vector_no_author(self): """book with no authors gets processed normally""" book = self._create_book("Book", None, series="Bunch") self.assertEqual(book.search_vector, "'book':1A 'bunch':2") + book = self._create_book("there there", None) + self.assertEqual(book.search_vector, "'there':1A,2A") + + # n.b.: the following originally from test_posgres.py + + def test_search_vector_on_update(self): + """make sure that search_vector is being set correctly on edit""" + book = self._create_book("The Long Goodbye", None) + self.assertEqual(book.search_vector, "'goodby':3A 'long':2A") + + book.title = "The Even Longer Goodbye" + book.save(broadcast=False) + book.refresh_from_db() + self.assertEqual(book.search_vector, "'even':2A 'goodby':4A 'longer':3A") + + def test_search_vector_on_author_update(self): + """update search when an author name changes""" + book = self._create_book("The Long Goodbye", "The Rays") + self.assertEqual(book.search_vector, "'goodby':3A 'long':2A 'rays':5C 'the':4C") + + author = models.Author.objects.get(name="The Rays") + author.name = "Jeremy" + author.save(broadcast=False) + book.refresh_from_db() + self.assertEqual(book.search_vector, "'goodby':3A 'jeremy':4C 'long':2A") + + def test_search_vector_on_author_delete(self): + """update search when an author is deleted""" + book = self._create_book("The Long Goodbye", "The Rays") + self.assertEqual(book.search_vector, "'goodby':3A 'long':2A 'rays':5C 'the':4C") + + author = models.Author.objects.get(name="The Rays") + book.authors.remove(author) + book.refresh_from_db() + self.assertEqual(book.search_vector, "'goodby':3A 'long':2A") + + def test_search_vector_fields(self): + """language field irrelevant for search_vector""" + author = models.Author.objects.create(name="The Rays") + book = models.Edition.objects.create( + title="The Long Goodbye", + subtitle="wow cool", + series="series name", + languages=["irrelevant"], + ) + book.authors.add(author) + book.refresh_from_db() + self.assertEqual( + book.search_vector, + # pylint: disable-next=line-too-long + "'cool':5B 'goodby':3A 'long':2A 'name':9 'rays':7C 'seri':8 'the':6C 'wow':4B", + ) + @staticmethod def _create_book( title, author_name, /, *, subtitle="", series="", author_alias=None @@ -212,8 +268,8 @@ class SearchVectorTest(TestCase): return edition -class SearchVectorTriggers(TestCase): - """look for books as they change""" +class SearchVectorUpdates(TestCase): + """look for books as they change""" # functional tests of the above def setUp(self): """we need basic test data and mocks""" diff --git a/bookwyrm/tests/test_postgres.py b/bookwyrm/tests/test_postgres.py deleted file mode 100644 index 8fc3c9d59..000000000 --- a/bookwyrm/tests/test_postgres.py +++ /dev/null @@ -1,77 +0,0 @@ -""" django configuration of postgres """ -from unittest.mock import patch -from django.test import TestCase - -from bookwyrm import models - - -@patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") -class PostgresTriggers(TestCase): - """special migrations, fancy stuff ya know""" - - 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, _): - """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" - book.save(broadcast=False) - book.refresh_from_db() - self.assertEqual(book.search_vector, "'even':2A 'goodby':4A 'longer':3A") - - 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( - title="The Long Goodbye", - subtitle="wow cool", - series="series name", - languages=["irrelevant"], - ) - book.authors.add(author) - book.refresh_from_db() - # pylint: disable=line-too-long - self.assertEqual( - book.search_vector, - "'cool':5B 'goodby':3A 'long':2A 'name':9 'rays':7C 'seri':8 'the':6C 'wow':4B", - ) - - def test_search_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( - title="The Long Goodbye", - ) - book.authors.add(author) - author.name = "Jeremy" - author.save(broadcast=False) - book.refresh_from_db() - - self.assertEqual(book.search_vector, "'goodby':3A 'jeremy':4C 'long':2A") - - def test_search_vector_on_author_delete(self, _): - """update search when an author name changes""" - author = models.Author.objects.create(name="Jeremy") - book = models.Edition.objects.create( - title="The Long Goodbye", - ) - - book.authors.add(author) - book.refresh_from_db() - self.assertEqual(book.search_vector, "'goodby':3A 'jeremy':4C 'long':2A") - - book.authors.remove(author) - book.refresh_from_db() - self.assertEqual(book.search_vector, "'goodby':3A 'long':2A") - - 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", - ) - book.refresh_from_db() - self.assertEqual(book.search_vector, "'there':1A,2A") From a6dc5bd13fff79f7ba55a170f784c047e15c09d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Mon, 18 Mar 2024 14:56:29 -0300 Subject: [PATCH 112/200] Make `get_file_size` robust against typing errors --- bookwyrm/templatetags/utilities.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index df5b5ab30..fb2113de4 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -130,10 +130,14 @@ def id_to_username(user_id): @register.filter(name="get_file_size") -def get_file_size(raw_size): +def get_file_size(nbytes): """display the size of a file in human readable terms""" try: + raw_size = float(nbytes) + except (ValueError, TypeError): + return repr(nbytes) + else: if raw_size < 1024: return f"{raw_size} bytes" if raw_size < 1024**2: @@ -142,10 +146,6 @@ def get_file_size(raw_size): return f"{raw_size/1024**2:.2f} MB" return f"{raw_size/1024**3:.2f} GB" - except Exception as error: # pylint: disable=broad-except - print(error) - return "" - @register.filter(name="get_user_permission") def get_user_permission(user): From 3be227fc86c104ccc115bc373b92bf7ef4a8d371 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 22:00:54 +0000 Subject: [PATCH 113/200] Bump pillow from 10.0.1 to 10.2.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.2.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/10.0.1...10.2.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c769916a2..d59a62c98 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ opentelemetry-instrumentation-celery==0.37b0 opentelemetry-instrumentation-django==0.37b0 opentelemetry-instrumentation-psycopg2==0.37b0 opentelemetry-sdk==1.16.0 -Pillow==10.0.1 +Pillow==10.2.0 protobuf==3.20.* psycopg2==2.9.5 pycryptodome==3.19.1 From ccf2b16d735679cb3349e449612b61d1b9141676 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 19:52:40 +0100 Subject: [PATCH 114/200] requirements.txt: make typing-Pillow match Pillow --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d59a62c98..5e8611076 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,7 +53,7 @@ pytidylib==0.3.2 types-bleach==6.0.0.4 types-dataclasses==0.6.6 types-Markdown==3.4.2.10 -types-Pillow==10.0.0.3 +types-Pillow==10.2.0.20240311 types-psycopg2==2.9.21.11 types-python-dateutil==2.8.19.14 types-requests==2.31.0.2 From 748418590fa4bbfd20615a2114c00e322ce8b581 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 20:22:14 +0100 Subject: [PATCH 115/200] docker-compose.yml: mount static_volume for flower Because flower also uses BookwyrmConfig, it wants to download fonts, and will download them to an incorrect location if the static_volume is not mounted. --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4d4037681..2cb9007da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -91,6 +91,7 @@ services: env_file: .env volumes: - .:/app + - static_volume:/app/static networks: - main depends_on: From 3367b20965d44b5f2724250491e0b54c84fc3769 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 20:23:26 +0100 Subject: [PATCH 116/200] Font download: destination dir is allowed to exist Without this argument, an existing directory (but not the file) causes an error. --- bookwyrm/apps.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/apps.py b/bookwyrm/apps.py index b0c3e3fa4..5a9f45db5 100644 --- a/bookwyrm/apps.py +++ b/bookwyrm/apps.py @@ -1,4 +1,5 @@ """Do further startup configuration and initialization""" + import os import urllib import logging @@ -14,7 +15,7 @@ def download_file(url, destination): """Downloads a file to the given path""" try: # Ensure our destination directory exists - os.makedirs(os.path.dirname(destination)) + os.makedirs(os.path.dirname(destination), exist_ok=True) with urllib.request.urlopen(url) as stream: with open(destination, "b+w") as outfile: outfile.write(stream.read()) From 7690247ab43db55e309a357494802c3ec724c0a6 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 20:24:02 +0100 Subject: [PATCH 117/200] Font download: log the exact error --- bookwyrm/apps.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bookwyrm/apps.py b/bookwyrm/apps.py index 5a9f45db5..41b1a17a2 100644 --- a/bookwyrm/apps.py +++ b/bookwyrm/apps.py @@ -19,12 +19,12 @@ def download_file(url, destination): with urllib.request.urlopen(url) as stream: with open(destination, "b+w") as outfile: outfile.write(stream.read()) - except (urllib.error.HTTPError, urllib.error.URLError): - logger.info("Failed to download file %s", url) - except OSError: - logger.info("Couldn't open font file %s for writing", destination) - except: # pylint: disable=bare-except - logger.info("Unknown error in file download") + except (urllib.error.HTTPError, urllib.error.URLError) as err: + logger.error("Failed to download file %s: %s", url, err) + except OSError as err: + logger.error("Couldn't open font file %s for writing: %s", destination, err) + except Exception as err: # pylint:disable=broad-except + logger.error("Unknown error in file download: %s", err) class BookwyrmConfig(AppConfig): From 864304f128fc897348342ba83506441469e8fe53 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 21:01:20 +0100 Subject: [PATCH 118/200] docker-compose.yml: make all bind mounts read only Except dev-tools, since it needs to be able to change the source. --- docker-compose.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4d4037681..6b68d6826 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: networks: - main volumes: - - ./nginx:/etc/nginx/conf.d + - ./nginx:/etc/nginx/conf.d:ro - static_volume:/app/static - media_volume:/app/images db: @@ -26,7 +26,7 @@ services: env_file: .env command: python manage.py runserver 0.0.0.0:8000 volumes: - - .:/app + - .:/app:ro - static_volume:/app/static - media_volume:/app/images depends_on: @@ -41,7 +41,7 @@ services: image: redis:7.2.1 command: redis-server --requirepass ${REDIS_ACTIVITY_PASSWORD} --appendonly yes --port ${REDIS_ACTIVITY_PORT} volumes: - - ./redis.conf:/etc/redis/redis.conf + - ./redis.conf:/etc/redis/redis.conf:ro - redis_activity_data:/data env_file: .env networks: @@ -51,7 +51,7 @@ services: image: redis:7.2.1 command: redis-server --requirepass ${REDIS_BROKER_PASSWORD} --appendonly yes --port ${REDIS_BROKER_PORT} volumes: - - ./redis.conf:/etc/redis/redis.conf + - ./redis.conf:/etc/redis/redis.conf:ro - redis_broker_data:/data env_file: .env networks: @@ -63,9 +63,8 @@ services: networks: - main command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc - volumes: - - .:/app + - .:/app:ro - static_volume:/app/static - media_volume:/app/images depends_on: @@ -79,7 +78,7 @@ services: - main command: celery -A celerywyrm beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler volumes: - - .:/app + - .:/app:ro - static_volume:/app/static - media_volume:/app/images depends_on: @@ -90,7 +89,7 @@ services: command: celery -A celerywyrm flower --basic_auth=${FLOWER_USER}:${FLOWER_PASSWORD} --url_prefix=flower env_file: .env volumes: - - .:/app + - .:/app:ro networks: - main depends_on: @@ -102,7 +101,7 @@ services: env_file: .env volumes: - /app/dev-tools/ - - .:/app + - .:/app:rw volumes: pgdata: static_volume: From 68cb94daf2e81ed755a4b04f73034e4a3f77d1be Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 21:02:06 +0100 Subject: [PATCH 119/200] docker-compose.yml: don't automatically start dev-tools by assigning profile --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 6b68d6826..9e2cd67ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,6 +102,8 @@ services: volumes: - /app/dev-tools/ - .:/app:rw + profiles: + - tools volumes: pgdata: static_volume: From 4d23edddca5692d7ef66f8b66b88e6f3bc061008 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 21:04:34 +0100 Subject: [PATCH 120/200] Make sure /images/ and /static/ exist now that the bind mount is read only Otherwise the static_volume and media_volume can't be mounted there. --- .gitignore | 1 + images/.gitkeep | 0 static/.gitkeep | 0 3 files changed, 1 insertion(+) create mode 100644 images/.gitkeep create mode 100644 static/.gitkeep diff --git a/.gitignore b/.gitignore index ec2a08f80..755375b34 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ # BookWyrm .env /images/ +/static/ bookwyrm/static/css/bookwyrm.css bookwyrm/static/css/themes/ !bookwyrm/static/css/themes/bookwyrm-*.scss diff --git a/images/.gitkeep b/images/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/static/.gitkeep b/static/.gitkeep new file mode 100644 index 000000000..e69de29bb From 47afe34d9767ad7895b7eb72bc4cd88f99eeb148 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:48:21 +0000 Subject: [PATCH 121/200] Bump django from 3.2.24 to 3.2.25 Bumps [django](https://github.com/django/django) from 3.2.24 to 3.2.25. - [Commits](https://github.com/django/django/compare/3.2.24...3.2.25) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c769916a2..3c0406acd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ boto3==1.26.57 bw-file-resubmit==0.6.0rc2 celery==5.3.1 colorthief==0.2.1 -Django==3.2.24 +Django==3.2.25 django-celery-beat==2.5.0 django-compressor==4.4 django-csp==3.7 From f423834bd0d8bd54afa29f56fd60459ac7209b67 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 18 Mar 2024 20:06:12 +0100 Subject: [PATCH 122/200] Catch the correct exception type from Pillow --- bookwyrm/preview_images.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index aba372abc..995f25bfd 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -1,4 +1,5 @@ """ Generate social media preview images for twitter/mastodon/etc """ + import math import os import textwrap @@ -42,8 +43,8 @@ def get_imagefont(name, size): return ImageFont.truetype(path, size) except KeyError: logger.error("Font %s not found in config", name) - except OSError: - logger.error("Could not load font %s from file", name) + except OSError as err: + logger.error("Could not load font %s from file: %s", name, err) return ImageFont.load_default() @@ -59,7 +60,7 @@ def get_font(weight, size=28): font.set_variation_by_name("Bold") if weight == "regular": font.set_variation_by_name("Regular") - except AttributeError: + except OSError: pass return font From 6a87713f9f4f1c6dd9ad169f967b1335692e203a Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 20 Mar 2024 11:45:12 +0100 Subject: [PATCH 123/200] Recalculate all book search vectors after fixing the author trigger --- .../0191_migrate_search_vec_triggers_to_pgtriggers.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py index 5e798b654..03442298f 100644 --- a/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py +++ b/bookwyrm/migrations/0191_migrate_search_vec_triggers_to_pgtriggers.py @@ -67,4 +67,10 @@ class Migration(migrations.Migration): """, reverse_sql=author_search_vector_trigger.sql, ), + migrations.RunSQL( + # Recalculate book search vector for any missed author name changes + # due to bug in JOIN in the old trigger. + sql="UPDATE bookwyrm_book SET search_vector = NULL;", + reverse_sql=migrations.RunSQL.noop, + ), ] From e13e4237f49e1079eb0190898c4b45b53399bcf9 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 20 Mar 2024 12:24:54 +0100 Subject: [PATCH 124/200] black: specify required-version This ensures consistent formatting among different contributors / development setups. https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html#required-version --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..292ca8c41 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[tool.black] +required-version = "22" From ab430e020824f08ca15fe3e0da824d9c5865d5c4 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 20 Mar 2024 12:43:14 +0100 Subject: [PATCH 125/200] requirements.txt: add black This way, IDEs can be set up to use the black version from the environment instead of a globally available/bundled black version. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 82b7bc8c8..6b3d838bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,6 +41,7 @@ setuptools>=65.5.1 # Not a direct dependency, pinned to get a security fix tornado==6.3.3 # Not a direct dependency, pinned to get a security fix # Dev +black==22.* celery-types==0.18.0 django-stubs[compatible-mypy]==4.2.4 mypy==1.5.1 From b5b9eddaf0a8336cf9766c901811022713fb78a6 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 20 Mar 2024 12:46:37 +0100 Subject: [PATCH 126/200] CI: relax black version constraints --- .github/workflows/python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index dcbe05aee..01241b467 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -94,6 +94,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 - - uses: psf/black@22.12.0 + - uses: psf/black@stable with: - version: 22.12.0 + version: "22.*" From 682bb3b62fb6ed53daf374376c9bd91f30295809 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 21 Mar 2024 16:25:29 +0100 Subject: [PATCH 127/200] dev-tools: relax black version constraint --- dev-tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/requirements.txt b/dev-tools/requirements.txt index a69d319ab..3bb771f5a 100644 --- a/dev-tools/requirements.txt +++ b/dev-tools/requirements.txt @@ -1 +1 @@ -black==22.12.0 +black==22.* From c3d25c59c51431cf7d5a2700b842a07410dd8936 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 21 Mar 2024 16:48:28 +0100 Subject: [PATCH 128/200] Escape search query in generated URLs Otherwise, a query containing '&' or other special characters results in a broken URL. --- bookwyrm/templates/search/book.html | 2 +- bookwyrm/templates/search/layout.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html index 262dcf2f9..b93c96754 100644 --- a/bookwyrm/templates/search/book.html +++ b/bookwyrm/templates/search/book.html @@ -109,7 +109,7 @@

    {% if request.user.is_authenticated %} {% if not remote %} - + {% trans "Load results from other catalogues" %} {% else %} diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html index 725a4f43f..59ea0304e 100644 --- a/bookwyrm/templates/search/layout.html +++ b/bookwyrm/templates/search/layout.html @@ -41,18 +41,18 @@

    From a914a44fba28defec6fefcbf90deee828176ddf5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 Mar 2024 07:54:54 -0700 Subject: [PATCH 129/200] Removes unnecessary redeclaration of wikidata model field in Author --- bookwyrm/models/author.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index b32d49d54..981e3c0cc 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -18,9 +18,6 @@ class Author(BookDataModel): wikipedia_link = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) - wikidata = fields.CharField( - max_length=255, blank=True, null=True, deduplication_field=True - ) isni = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) From 2de35f3fc7ef1a1418ed4638cce89d2b7dfae999 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 20 Mar 2024 16:14:26 +0100 Subject: [PATCH 130/200] Calculate Author search vector with name and aliases --- .../migrations/0197_author_search_vector.py | 41 +++++++++++++++++++ bookwyrm/models/author.py | 21 +++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 bookwyrm/migrations/0197_author_search_vector.py diff --git a/bookwyrm/migrations/0197_author_search_vector.py b/bookwyrm/migrations/0197_author_search_vector.py new file mode 100644 index 000000000..baa540cc0 --- /dev/null +++ b/bookwyrm/migrations/0197_author_search_vector.py @@ -0,0 +1,41 @@ +# Generated by Django 3.2.25 on 2024-03-20 15:15 + +import django.contrib.postgres.indexes +from django.db import migrations +import pgtrigger.compiler +import pgtrigger.migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0196_merge_pr3134_into_main"), + ] + + operations = [ + migrations.AddIndex( + model_name="author", + index=django.contrib.postgres.indexes.GinIndex( + fields=["search_vector"], name="bookwyrm_au_search__b050a8_gin" + ), + ), + pgtrigger.migrations.AddTrigger( + model_name="author", + trigger=pgtrigger.compiler.Trigger( + name="update_search_vector_on_author_edit", + sql=pgtrigger.compiler.UpsertTriggerSql( + func="new.search_vector := setweight(to_tsvector('simple', new.name), 'A') || setweight(to_tsvector('simple', coalesce(array_to_string(new.aliases, ' '), '')), 'B');RETURN NEW;", + hash="b97919016236d74d0ade51a0769a173ea269da64", + operation='INSERT OR UPDATE OF "name", "aliases", "search_vector"', + pgid="pgtrigger_update_search_vector_on_author_edit_c61cb", + table="bookwyrm_author", + when="BEFORE", + ), + ), + ), + migrations.RunSQL( + # Calculate search vector for all Authors. + sql="UPDATE bookwyrm_author SET search_vector = NULL;", + reverse_sql="UPDATE bookwyrm_author SET search_vector = NULL;", + ), + ] diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 154b00ccb..9c3621c3d 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -3,6 +3,7 @@ import re from typing import Tuple, Any from django.db import models +from django.contrib.postgres.indexes import GinIndex import pgtrigger from bookwyrm import activitypub @@ -71,7 +72,25 @@ class Author(BookDataModel): class Meta: """sets up indexes and triggers""" + # pylint: disable=line-too-long + + indexes = (GinIndex(fields=["search_vector"]),) triggers = [ + pgtrigger.Trigger( + name="update_search_vector_on_author_edit", + when=pgtrigger.Before, + operation=pgtrigger.Insert + | pgtrigger.UpdateOf("name", "aliases", "search_vector"), + func=format_trigger( + """new.search_vector := + -- author name, with priority A + setweight(to_tsvector('simple', new.name), 'A') || + -- author aliases, with priority B + setweight(to_tsvector('simple', coalesce(array_to_string(new.aliases, ' '), '')), 'B'); + RETURN new; + """ + ), + ), pgtrigger.Trigger( name="reset_search_vector_on_author_edit", when=pgtrigger.After, @@ -89,7 +108,7 @@ class Author(BookDataModel): RETURN new; """ ), - ) + ), ] activity_serializer = activitypub.Author From 0795b4d171c135e2832bb81f574150703adc1f3b Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 20 Mar 2024 16:18:55 +0100 Subject: [PATCH 131/200] Include Author aliases in Book search vector --- .../0198_book_search_vector_author_aliases.py | 57 +++++++++++++++++++ bookwyrm/models/author.py | 4 +- bookwyrm/models/book.py | 46 +++++++++------ 3 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 bookwyrm/migrations/0198_book_search_vector_author_aliases.py diff --git a/bookwyrm/migrations/0198_book_search_vector_author_aliases.py b/bookwyrm/migrations/0198_book_search_vector_author_aliases.py new file mode 100644 index 000000000..491cb64bb --- /dev/null +++ b/bookwyrm/migrations/0198_book_search_vector_author_aliases.py @@ -0,0 +1,57 @@ +# Generated by Django 3.2.25 on 2024-03-20 15:52 + +from django.db import migrations +import pgtrigger.compiler +import pgtrigger.migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0197_author_search_vector"), + ] + + operations = [ + pgtrigger.migrations.RemoveTrigger( + model_name="author", + name="reset_search_vector_on_author_edit", + ), + pgtrigger.migrations.RemoveTrigger( + model_name="book", + name="update_search_vector_on_book_edit", + ), + pgtrigger.migrations.AddTrigger( + model_name="author", + trigger=pgtrigger.compiler.Trigger( + name="reset_book_search_vector_on_author_edit", + sql=pgtrigger.compiler.UpsertTriggerSql( + func="WITH updated_books AS (SELECT book_id FROM bookwyrm_book_authors WHERE author_id = new.id ) UPDATE bookwyrm_book SET search_vector = '' FROM updated_books WHERE id = updated_books.book_id;RETURN NEW;", + hash="68422c0f29879c5802b82159dde45297eff53e73", + operation='UPDATE OF "name", "aliases"', + pgid="pgtrigger_reset_book_search_vector_on_author_edit_a50c7", + table="bookwyrm_author", + when="AFTER", + ), + ), + ), + pgtrigger.migrations.AddTrigger( + model_name="book", + trigger=pgtrigger.compiler.Trigger( + name="update_search_vector_on_book_edit", + sql=pgtrigger.compiler.UpsertTriggerSql( + func="WITH author_names AS (SELECT array_to_string(bookwyrm_author.name || bookwyrm_author.aliases, ' ') AS name_and_aliases FROM bookwyrm_author LEFT JOIN bookwyrm_book_authors ON bookwyrm_author.id = bookwyrm_book_authors.author_id WHERE bookwyrm_book_authors.book_id = new.id ) SELECT setweight(coalesce(nullif(to_tsvector('english', new.title), ''), to_tsvector('simple', new.title)), 'A') || setweight(to_tsvector('english', coalesce(new.subtitle, '')), 'B') || (SELECT setweight(to_tsvector('simple', coalesce(array_to_string(array_agg(name_and_aliases), ' '), '')), 'C') FROM author_names) || setweight(to_tsvector('english', coalesce(new.series, '')), 'D') INTO new.search_vector;RETURN NEW;", + hash="9324f5ca76a6f5e63931881d62d11da11f595b2c", + operation='INSERT OR UPDATE OF "title", "subtitle", "series", "search_vector"', + pgid="pgtrigger_update_search_vector_on_book_edit_bec58", + table="bookwyrm_book", + when="BEFORE", + ), + ), + ), + migrations.RunSQL( + # Recalculate search vector for all Books because it now includes + # Author aliases. + sql="UPDATE bookwyrm_book SET search_vector = NULL;", + reverse_sql="UPDATE bookwyrm_book SET search_vector = NULL;", + ), + ] diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 9c3621c3d..9dc3962ad 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -92,9 +92,9 @@ class Author(BookDataModel): ), ), pgtrigger.Trigger( - name="reset_search_vector_on_author_edit", + name="reset_book_search_vector_on_author_edit", when=pgtrigger.After, - operation=pgtrigger.UpdateOf("name"), + operation=pgtrigger.UpdateOf("name", "aliases"), func=format_trigger( """WITH updated_books AS ( SELECT book_id diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index e167e2138..5dba6532f 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -246,24 +246,34 @@ class Book(BookDataModel): operation=pgtrigger.Insert | pgtrigger.UpdateOf("title", "subtitle", "series", "search_vector"), func=format_trigger( - """new.search_vector := - -- title, with priority A (parse in English, default to simple if empty) - setweight(COALESCE(nullif( - to_tsvector('english', new.title), ''), - to_tsvector('simple', new.title)), 'A') || - -- subtitle, with priority B (always in English?) - setweight(to_tsvector('english', COALESCE(new.subtitle, '')), 'B') || - -- list of authors, with priority C (TODO: add aliases?, bookwyrm-social#3063) - (SELECT setweight(to_tsvector('simple', COALESCE(array_to_string(ARRAY_AGG(bookwyrm_author.name), ' '), '')), 'C') - FROM bookwyrm_author - LEFT JOIN bookwyrm_book_authors - ON bookwyrm_author.id = bookwyrm_book_authors.author_id - WHERE bookwyrm_book_authors.book_id = new.id - ) || - --- last: series name, with lowest priority - setweight(to_tsvector('english', COALESCE(new.series, '')), 'D'); - RETURN new; - """ + """ + WITH author_names AS ( + SELECT array_to_string(bookwyrm_author.name || bookwyrm_author.aliases, ' ') AS name_and_aliases + FROM bookwyrm_author + LEFT JOIN bookwyrm_book_authors + ON bookwyrm_author.id = bookwyrm_book_authors.author_id + WHERE bookwyrm_book_authors.book_id = new.id + ) + SELECT + -- title, with priority A (parse in English, default to simple if empty) + setweight(COALESCE(nullif( + to_tsvector('english', new.title), ''), + to_tsvector('simple', new.title)), 'A') || + + -- subtitle, with priority B (always in English?) + setweight(to_tsvector('english', COALESCE(new.subtitle, '')), 'B') || + + -- list of authors names and aliases (with priority C) + (SELECT setweight(to_tsvector('simple', COALESCE(array_to_string(ARRAY_AGG(name_and_aliases), ' '), '')), 'C') + FROM author_names + ) || + + --- last: series name, with lowest priority + setweight(to_tsvector('english', COALESCE(new.series, '')), 'D') + + INTO new.search_vector; + RETURN new; + """ ), ) ] From 36222afa7995e19e6daf6cb4523039d140adf4af Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 19 Mar 2024 13:12:45 +0100 Subject: [PATCH 132/200] Switch author search from TrigramSimilarity to SearchQuery --- bookwyrm/views/search.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index e1598056f..13695a7d4 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -2,8 +2,9 @@ import re -from django.contrib.postgres.search import TrigramSimilarity +from django.contrib.postgres.search import TrigramSimilarity, SearchRank, SearchQuery from django.core.paginator import Paginator +from django.db.models import F from django.db.models.functions import Greatest from django.http import JsonResponse from django.template.response import TemplateResponse @@ -94,26 +95,28 @@ def book_search(request): def author_search(request): """search for an author""" - query = request.GET.get("q") - query = query.strip() - data = {"type": "author", "query": query} + query = request.GET.get("q").strip() + search_query = SearchQuery(query, config="simple") + min_confidence = 0 results = ( - models.Author.objects.annotate( - similarity=TrigramSimilarity("name", query), - ) - .filter( - similarity__gt=0.1, - ) - .order_by("-similarity") + models.Author.objects.filter(search_vector=search_query) + .annotate(rank=SearchRank(F("search_vector"), search_query)) + .filter(rank__gt=min_confidence) + .order_by("-rank") ) paginated = Paginator(results, PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) - data["results"] = page - data["page_range"] = paginated.get_elided_page_range( - page.number, on_each_side=2, on_ends=1 - ) + + data = { + "type": "author", + "query": query, + "results": page, + "page_range": paginated.get_elided_page_range( + page.number, on_each_side=2, on_ends=1 + ), + } return TemplateResponse(request, "search/author.html", data) From 769d9726e5cfb69ab8dcaa173dc1bcb062a29db0 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 22 Mar 2024 21:43:28 +0100 Subject: [PATCH 133/200] Add book search test cases for author aliases --- bookwyrm/tests/test_book_search.py | 57 ++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index 0721cb142..b8c1ee1d3 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -14,6 +14,13 @@ class BookSearch(TestCase): @classmethod def setUpTestData(self): # pylint: disable=bad-classmethod-argument """we need basic test data and mocks""" + self.first_author = models.Author.objects.create( + name="Author One", aliases=["The First"] + ) + self.second_author = models.Author.objects.create( + name="Author Two", aliases=["The Second"] + ) + self.work = models.Work.objects.create(title="Example Work") self.first_edition = models.Edition.objects.create( @@ -23,6 +30,8 @@ class BookSearch(TestCase): physical_format="Paperback", published_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc), ) + self.first_edition.authors.add(self.first_author) + self.second_edition = models.Edition.objects.create( title="Another Edition", parent_work=self.work, @@ -30,19 +39,34 @@ class BookSearch(TestCase): openlibrary_key="hello", pages=150, ) + self.second_edition.authors.add(self.first_author) + self.second_edition.authors.add(self.second_author) + self.third_edition = models.Edition.objects.create( title="Another Edition with annoying ISBN", parent_work=self.work, isbn_10="022222222X", ) + self.third_edition.authors.add(self.first_author) + self.third_edition.authors.add(self.second_author) def test_search(self): """search for a book in the db""" - # title/author + # title results = book_search.search("Example") self.assertEqual(len(results), 1) self.assertEqual(results[0], self.first_edition) + # author + results = book_search.search("One") + self.assertEqual(len(results), 1) + self.assertEqual(results[0], self.first_edition) + + # author alias + results = book_search.search("First") + self.assertEqual(len(results), 1) + self.assertEqual(results[0], self.first_edition) + # isbn results = book_search.search("0000000000") self.assertEqual(len(results), 1) @@ -155,8 +179,17 @@ class SearchVectorTest(TestCase): """search vector with subtitle and series""" # for a book like this we call `to_tsvector("Book Long Mary Bunch")`, hence the # indexes in the search vector. (priority "D" is the default, and never shown.) - book = self._create_book("Book", "Mary", subtitle="Long", series="Bunch") - self.assertEqual(book.search_vector, "'book':1A 'bunch':4 'long':2B 'mary':3C") + book = self._create_book( + "Book", + "Mary", + subtitle="Long", + series="Bunch", + author_alias=["Maria", "Mary Ann"], + ) + self.assertEqual( + book.search_vector, + "'ann':6C 'book':1A 'bunch':7 'long':2B 'maria':4C 'mary':3C,5C", + ) def test_search_vector_parse_book(self): """book parts are parsed in english""" @@ -170,8 +203,8 @@ class SearchVectorTest(TestCase): def test_search_vector_parse_author(self): """author name is not stem'd or affected by stop words""" - book = self._create_book("Writing", "Writes") - self.assertEqual(book.search_vector, "'write':1A 'writes':2C") + book = self._create_book("Writing", "Writes", author_alias=["Reads"]) + self.assertEqual(book.search_vector, "'reads':3C 'write':1A 'writes':2C") book = self._create_book("She Is Writing", "She Writes") self.assertEqual(book.search_vector, "'she':4C 'write':3A 'writes':5C") @@ -218,6 +251,13 @@ class SearchVectorTest(TestCase): book.refresh_from_db() self.assertEqual(book.search_vector, "'goodby':3A 'jeremy':4C 'long':2A") + author.aliases = ["Example"] + author.save(broadcast=False) + book.refresh_from_db() + self.assertEqual( + book.search_vector, "'example':5C 'goodby':3A 'jeremy':4C 'long':2A" + ) + def test_search_vector_on_author_delete(self): """update search when an author is deleted""" book = self._create_book("The Long Goodbye", "The Rays") @@ -274,7 +314,7 @@ class SearchVectorUpdates(TestCase): def setUp(self): """we need basic test data and mocks""" self.work = models.Work.objects.create(title="This Work") - self.author = models.Author.objects.create(name="Name") + self.author = models.Author.objects.create(name="Name", aliases=["Alias"]) self.edition = models.Edition.objects.create( title="First Edition of Work", subtitle="Some Extra Words Are Good", @@ -363,13 +403,18 @@ class SearchVectorUpdates(TestCase): def test_search_after_updated_author_name(self): """book found under new author name""" self.assertEqual(self.edition, self._search_first("Name")) + self.assertEqual(self.edition, self._search_first("Alias")) self.assertFalse(self._search("Identifier")) + self.assertFalse(self._search("Another")) self.author.name = "Identifier" + self.author.aliases = ["Another"] self.author.save(broadcast=False) self.assertFalse(self._search("Name")) + self.assertFalse(self._search("Aliases")) self.assertEqual(self.edition, self._search_first("Identifier")) + self.assertEqual(self.edition, self._search_first("Another")) self.assertEqual(self.edition, self._search_first("Work")) def _search_first(self, query): From b8995bd4b1bbb0f26eb0a6751fec1a8622389223 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 22 Mar 2024 22:06:19 +0100 Subject: [PATCH 134/200] Add tests for author search --- bookwyrm/tests/test_author_search.py | 87 ++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 bookwyrm/tests/test_author_search.py diff --git a/bookwyrm/tests/test_author_search.py b/bookwyrm/tests/test_author_search.py new file mode 100644 index 000000000..e6b20a2c6 --- /dev/null +++ b/bookwyrm/tests/test_author_search.py @@ -0,0 +1,87 @@ +""" test searching for authors """ +from django.test import TestCase + +from django.contrib.postgres.search import SearchRank, SearchQuery +from django.db.models import F + +from bookwyrm import models + + +class AuthorSearch(TestCase): + """look for some authors""" + + @classmethod + def setUpTestData(cls): + """we need basic test data and mocks""" + cls.bob = models.Author.objects.create( + name="Bob", aliases=["Robertus", "Alice"] + ) + cls.alice = models.Author.objects.create(name="Alice") + + def test_search(self): + """search for an author in the db""" + results = self._search("Bob") + self.assertEqual(len(results), 1) + self.assertEqual(results[0], self.bob) + + def test_alias_priority(self): + """aliases should be included, with lower priority than name""" + results = self._search("Alice") + self.assertEqual(len(results), 2) + self.assertEqual(results[0], self.alice) + + def _search_first(self, query): + """wrapper around search_title_author""" + return self._search(query, return_first=True) + + @staticmethod + def _search(query, *, return_first=False): + """author search""" + search_query = SearchQuery(query, config="simple") + min_confidence = 0 + + results = ( + models.Author.objects.filter(search_vector=search_query) + .annotate(rank=SearchRank(F("search_vector"), search_query)) + .filter(rank__gt=min_confidence) + .order_by("-rank") + ) + if return_first: + return results.first() + return results + + +class SearchVectorTest(TestCase): + """check search_vector is computed correctly""" + + def test_search_vector_simple(self): + """simplest search vector""" + author = self._create_author("Mary") + self.assertEqual(author.search_vector, "'mary':1A") + + def test_search_vector_aliases(self): + """author aliases should be included with lower priority""" + author = self._create_author("Mary", aliases=["Maria", "Example"]) + self.assertEqual(author.search_vector, "'example':3B 'maria':2B 'mary':1A") + + def test_search_vector_parse_author(self): + """author name and alias is not stem'd or affected by stop words""" + author = self._create_author("Writes", aliases=["Reads"]) + self.assertEqual(author.search_vector, "'reads':2B 'writes':1A") + + def test_search_vector_on_update(self): + """make sure that search_vector is being set correctly on edit""" + author = self._create_author("Mary") + self.assertEqual(author.search_vector, "'mary':1A") + + author.name = "Example" + author.save(broadcast=False) + author.refresh_from_db() + self.assertEqual(author.search_vector, "'example':1A") + + @staticmethod + def _create_author(name, /, *, aliases=None): + """quickly create an author""" + author = models.Author.objects.create(name=name, aliases=aliases or []) + author.refresh_from_db() + return author From b3753ab6dac5e872f612cd10c3aa9d396ee8ed63 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 28 Feb 2024 22:31:41 +0100 Subject: [PATCH 135/200] Add MergedBookDataModel --- .../0197_mergedauthor_mergedbook.py | 48 +++++++++++++++++++ bookwyrm/models/book.py | 39 +++++++++++++-- 2 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/migrations/0197_mergedauthor_mergedbook.py diff --git a/bookwyrm/migrations/0197_mergedauthor_mergedbook.py b/bookwyrm/migrations/0197_mergedauthor_mergedbook.py new file mode 100644 index 000000000..23ca38ab2 --- /dev/null +++ b/bookwyrm/migrations/0197_mergedauthor_mergedbook.py @@ -0,0 +1,48 @@ +# Generated by Django 3.2.24 on 2024-02-28 21:30 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0196_merge_pr3134_into_main"), + ] + + operations = [ + migrations.CreateModel( + name="MergedBook", + fields=[ + ("deleted_id", models.IntegerField(primary_key=True, serialize=False)), + ( + "merged_into", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="absorbed", + to="bookwyrm.book", + ), + ), + ], + options={ + "abstract": False, + }, + ), + migrations.CreateModel( + name="MergedAuthor", + fields=[ + ("deleted_id", models.IntegerField(primary_key=True, serialize=False)), + ( + "merged_into", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="absorbed", + to="bookwyrm.author", + ), + ), + ], + options={ + "abstract": False, + }, + ), + ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index e167e2138..7a4a8addb 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -1,4 +1,5 @@ """ database schema for books and shelves """ + from itertools import chain import re from typing import Any @@ -192,9 +193,13 @@ class Book(BookDataModel): """properties of this edition, as a string""" items = [ self.physical_format if hasattr(self, "physical_format") else None, - f"{self.languages[0]} language" - if self.languages and self.languages[0] and self.languages[0] != "English" - else None, + ( + f"{self.languages[0]} language" + if self.languages + and self.languages[0] + and self.languages[0] != "English" + else None + ), str(self.published_date.year) if self.published_date else None, ", ".join(self.publishers) if hasattr(self, "publishers") else None, ] @@ -451,6 +456,34 @@ class Edition(Book): return queryset +class MergedBookDataModel(models.Model): + """a BookDataModel instance that has been merged into another instance. kept + to be able to redirect old URLs""" + + deleted_id = models.IntegerField(primary_key=True) + + class Meta: + """abstract just like BookDataModel""" + + abstract = True + + +class MergedAuthor(MergedBookDataModel): + """an Author that has been merged into another one""" + + merged_into = models.ForeignKey( + "Author", on_delete=models.PROTECT, related_name="absorbed" + ) + + +class MergedBook(MergedBookDataModel): + """an Book that has been merged into another one""" + + merged_into = models.ForeignKey( + "Book", on_delete=models.PROTECT, related_name="absorbed" + ) + + def isbn_10_to_13(isbn_10): """convert an isbn 10 into an isbn 13""" isbn_10 = re.sub(r"[^0-9X]", "", isbn_10) From 5e123972e88b751217c82564c7f447dbdc69b48d Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 22 Feb 2024 10:27:38 +0100 Subject: [PATCH 136/200] BookDataModel: implement merge_into method --- .../commands/deduplicate_book_data.py | 17 +-- bookwyrm/management/merge.py | 50 -------- bookwyrm/management/merge_command.py | 3 +- bookwyrm/models/author.py | 5 +- bookwyrm/models/book.py | 110 +++++++++++++----- 5 files changed, 95 insertions(+), 90 deletions(-) delete mode 100644 bookwyrm/management/merge.py diff --git a/bookwyrm/management/commands/deduplicate_book_data.py b/bookwyrm/management/commands/deduplicate_book_data.py index dde7d133c..d2f4ef936 100644 --- a/bookwyrm/management/commands/deduplicate_book_data.py +++ b/bookwyrm/management/commands/deduplicate_book_data.py @@ -1,13 +1,14 @@ """ PROCEED WITH CAUTION: uses deduplication fields to permanently merge book data objects """ + from django.core.management.base import BaseCommand from django.db.models import Count from bookwyrm import models -from bookwyrm.management.merge import merge_objects def dedupe_model(model): """combine duplicate editions and update related models""" + print(f"deduplicating {model.__name__}:") fields = model._meta.get_fields() dedupe_fields = [ f for f in fields if hasattr(f, "deduplication_field") and f.deduplication_field @@ -16,27 +17,27 @@ def dedupe_model(model): dupes = ( model.objects.values(field.name) .annotate(Count(field.name)) - .filter(**{"%s__count__gt" % field.name: 1}) + .filter(**{f"{field.name}__count__gt": 1}) + .exclude(**{field.name: ""}) + .exclude(**{f"{field.name}__isnull": True}) ) for dupe in dupes: value = dupe[field.name] - if not value or value == "": - continue print("----------") - print(dupe) objs = model.objects.filter(**{field.name: value}).order_by("id") canonical = objs.first() - print("keeping", canonical.remote_id) + print(f"merging into {canonical.remote_id} based on {field.name} {value}:") for obj in objs[1:]: - print(obj.remote_id) - merge_objects(canonical, obj) + print(f"- {obj.remote_id}") + obj.merge_into(canonical) class Command(BaseCommand): """deduplicate allllll the book data models""" help = "merges duplicate book data" + # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run deduplications""" diff --git a/bookwyrm/management/merge.py b/bookwyrm/management/merge.py deleted file mode 100644 index f55229f18..000000000 --- a/bookwyrm/management/merge.py +++ /dev/null @@ -1,50 +0,0 @@ -from django.db.models import ManyToManyField - - -def update_related(canonical, obj): - """update all the models with fk to the object being removed""" - # move related models to canonical - related_models = [ - (r.remote_field.name, r.related_model) for r in canonical._meta.related_objects - ] - for (related_field, related_model) in related_models: - # Skip the ManyToMany fields that aren’t auto-created. These - # should have a corresponding OneToMany field in the model for - # the linking table anyway. If we update it through that model - # instead then we won’t lose the extra fields in the linking - # table. - related_field_obj = related_model._meta.get_field(related_field) - if isinstance(related_field_obj, ManyToManyField): - through = related_field_obj.remote_field.through - if not through._meta.auto_created: - continue - related_objs = related_model.objects.filter(**{related_field: obj}) - for related_obj in related_objs: - print("replacing in", related_model.__name__, related_field, related_obj.id) - try: - setattr(related_obj, related_field, canonical) - related_obj.save() - except TypeError: - getattr(related_obj, related_field).add(canonical) - getattr(related_obj, related_field).remove(obj) - - -def copy_data(canonical, obj): - """try to get the most data possible""" - for data_field in obj._meta.get_fields(): - if not hasattr(data_field, "activitypub_field"): - continue - data_value = getattr(obj, data_field.name) - if not data_value: - continue - if not getattr(canonical, data_field.name): - print("setting data field", data_field.name, data_value) - setattr(canonical, data_field.name, data_value) - canonical.save() - - -def merge_objects(canonical, obj): - copy_data(canonical, obj) - update_related(canonical, obj) - # remove the outdated entry - obj.delete() diff --git a/bookwyrm/management/merge_command.py b/bookwyrm/management/merge_command.py index 805dc73fa..2f3f90c86 100644 --- a/bookwyrm/management/merge_command.py +++ b/bookwyrm/management/merge_command.py @@ -1,4 +1,3 @@ -from bookwyrm.management.merge import merge_objects from django.core.management.base import BaseCommand @@ -26,4 +25,4 @@ class MergeCommand(BaseCommand): print("other book doesn’t exist!") return - merge_objects(canonical, other) + other.merge_into(canonical) diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 154b00ccb..7f40f562c 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -1,4 +1,5 @@ """ database schema for info about authors """ + import re from typing import Tuple, Any @@ -9,13 +10,15 @@ from bookwyrm import activitypub from bookwyrm.settings import DOMAIN from bookwyrm.utils.db import format_trigger -from .book import BookDataModel +from .book import BookDataModel, MergedAuthor from . import fields class Author(BookDataModel): """basic biographic info""" + merged_model = MergedAuthor + wikipedia_link = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 7a4a8addb..c7235a3f5 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -3,12 +3,13 @@ from itertools import chain import re from typing import Any +from typing_extensions import Self from django.contrib.postgres.search import SearchVectorField from django.contrib.postgres.indexes import GinIndex from django.core.cache import cache from django.db import models, transaction -from django.db.models import Prefetch +from django.db.models import Prefetch, ManyToManyField from django.dispatch import receiver from django.utils.translation import gettext_lazy as _ from model_utils import FieldTracker @@ -109,10 +110,89 @@ class BookDataModel(ObjectMixin, BookWyrmModel): """only send book data updates to other bookwyrm instances""" super().broadcast(activity, sender, software=software, **kwargs) + def merge_into(self, canonical: Self) -> None: + """merge this entity into another entity""" + if canonical.id == self.id: + raise ValueError(f"Cannot merge {self} into itself") + + canonical.absorb_data_from(self) + canonical.save() + + self.merged_model.objects.create(deleted_id=self.id, merged_into=canonical) + + # move related models to canonical + related_models = [ + (r.remote_field.name, r.related_model) for r in self._meta.related_objects + ] + # pylint: disable=protected-access + for related_field, related_model in related_models: + # Skip the ManyToMany fields that aren’t auto-created. These + # should have a corresponding OneToMany field in the model for + # the linking table anyway. If we update it through that model + # instead then we won’t lose the extra fields in the linking + # table. + # pylint: disable=protected-access + related_field_obj = related_model._meta.get_field(related_field) + if isinstance(related_field_obj, ManyToManyField): + through = related_field_obj.remote_field.through + if not through._meta.auto_created: + continue + related_objs = related_model.objects.filter(**{related_field: self}) + for related_obj in related_objs: + try: + setattr(related_obj, related_field, canonical) + related_obj.save() + except TypeError: + getattr(related_obj, related_field).add(canonical) + getattr(related_obj, related_field).remove(self) + + self.delete() + + def absorb_data_from(self, other: Self) -> None: + """fill empty fields with values from another entity""" + for data_field in self._meta.get_fields(): + if not hasattr(data_field, "activitypub_field"): + continue + data_value = getattr(other, data_field.name) + if not data_value: + continue + if not getattr(self, data_field.name): + setattr(self, data_field.name, data_value) + + +class MergedBookDataModel(models.Model): + """a BookDataModel instance that has been merged into another instance. kept + to be able to redirect old URLs""" + + deleted_id = models.IntegerField(primary_key=True) + + class Meta: + """abstract just like BookDataModel""" + + abstract = True + + +class MergedBook(MergedBookDataModel): + """an Book that has been merged into another one""" + + merged_into = models.ForeignKey( + "Book", on_delete=models.PROTECT, related_name="absorbed" + ) + + +class MergedAuthor(MergedBookDataModel): + """an Author that has been merged into another one""" + + merged_into = models.ForeignKey( + "Author", on_delete=models.PROTECT, related_name="absorbed" + ) + class Book(BookDataModel): """a generic book, which can mean either an edition or a work""" + merged_model = MergedBook + connector = models.ForeignKey("Connector", on_delete=models.PROTECT, null=True) # book/work metadata @@ -456,34 +536,6 @@ class Edition(Book): return queryset -class MergedBookDataModel(models.Model): - """a BookDataModel instance that has been merged into another instance. kept - to be able to redirect old URLs""" - - deleted_id = models.IntegerField(primary_key=True) - - class Meta: - """abstract just like BookDataModel""" - - abstract = True - - -class MergedAuthor(MergedBookDataModel): - """an Author that has been merged into another one""" - - merged_into = models.ForeignKey( - "Author", on_delete=models.PROTECT, related_name="absorbed" - ) - - -class MergedBook(MergedBookDataModel): - """an Book that has been merged into another one""" - - merged_into = models.ForeignKey( - "Book", on_delete=models.PROTECT, related_name="absorbed" - ) - - def isbn_10_to_13(isbn_10): """convert an isbn 10 into an isbn 13""" isbn_10 = re.sub(r"[^0-9X]", "", isbn_10) From e04cd79ff85a4c0637d721cf831ed1320125bdb4 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 1 Mar 2024 14:37:52 +0100 Subject: [PATCH 137/200] Redirect to new URL when a merged object is requested --- bookwyrm/views/author.py | 15 ++++++++---- bookwyrm/views/books/books.py | 33 +++++++++++++++++++-------- bookwyrm/views/books/edit_book.py | 10 ++++---- bookwyrm/views/books/editions.py | 9 ++++---- bookwyrm/views/books/links.py | 12 ++++++---- bookwyrm/views/books/series.py | 14 +++++++----- bookwyrm/views/get_started.py | 6 +++-- bookwyrm/views/helpers.py | 19 ++++++++++++++- bookwyrm/views/reading.py | 6 +++-- bookwyrm/views/shelf/shelf_actions.py | 7 +++--- bookwyrm/views/status.py | 12 ++++++---- 11 files changed, 97 insertions(+), 46 deletions(-) diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 4dcf4c447..56977622f 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -1,4 +1,5 @@ """ the good people stuff! the authors! """ + from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator from django.shortcuts import get_object_or_404, redirect @@ -11,7 +12,11 @@ from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.connectors import connector_manager from bookwyrm.settings import PAGE_LENGTH -from bookwyrm.views.helpers import is_api_request, maybe_redirect_local_path +from bookwyrm.views.helpers import ( + is_api_request, + get_mergeable_object_or_404, + maybe_redirect_local_path, +) # pylint: disable= no-self-use @@ -21,7 +26,7 @@ class Author(View): # pylint: disable=unused-argument def get(self, request, author_id, slug=None): """landing page for an author""" - author = get_object_or_404(models.Author, id=author_id) + author = get_mergeable_object_or_404(models.Author, id=author_id) if is_api_request(request): return ActivitypubResponse(author.to_activity()) @@ -56,13 +61,13 @@ class EditAuthor(View): def get(self, request, author_id): """info about a book""" - author = get_object_or_404(models.Author, id=author_id) + author = get_mergeable_object_or_404(models.Author, id=author_id) data = {"author": author, "form": forms.AuthorForm(instance=author)} return TemplateResponse(request, "author/edit_author.html", data) def post(self, request, author_id): """edit a author cool""" - author = get_object_or_404(models.Author, id=author_id) + author = get_mergeable_object_or_404(models.Author, id=author_id) form = forms.AuthorForm(request.POST, request.FILES, instance=author) if not form.is_valid(): @@ -82,7 +87,7 @@ def update_author_from_remote(request, author_id, connector_identifier): connector = connector_manager.load_connector( get_object_or_404(models.Connector, identifier=connector_identifier) ) - author = get_object_or_404(models.Author, id=author_id) + author = get_mergeable_object_or_404(models.Author, id=author_id) connector.update_author_from_remote(author) diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 565220b6e..bbf041850 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -1,4 +1,5 @@ """ the good stuff! the books! """ + from uuid import uuid4 from django.contrib.auth.decorators import login_required, permission_required @@ -15,7 +16,11 @@ from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.connectors import connector_manager, ConnectorException from bookwyrm.connectors.abstract_connector import get_image from bookwyrm.settings import PAGE_LENGTH -from bookwyrm.views.helpers import is_api_request, maybe_redirect_local_path +from bookwyrm.views.helpers import ( + is_api_request, + maybe_redirect_local_path, + get_mergeable_object_or_404, +) # pylint: disable=no-self-use @@ -40,7 +45,11 @@ class Book(View): # table, so they never have clashing IDs book = ( models.Edition.viewer_aware_objects(request.user) - .filter(Q(id=book_id) | Q(parent_work__id=book_id)) + .filter( + Q(id=book_id) + | Q(parent_work__id=book_id) + | Q(absorbed__deleted_id=book_id) + ) .order_by("-edition_rank") .select_related("parent_work") .prefetch_related("authors", "file_links") @@ -82,11 +91,13 @@ class Book(View): "book": book, "statuses": paginated.get_page(request.GET.get("page")), "review_count": reviews.count(), - "ratings": reviews.filter( - Q(content__isnull=True) | Q(content="") - ).select_related("user") - if not user_statuses - else None, + "ratings": ( + reviews.filter(Q(content__isnull=True) | Q(content="")).select_related( + "user" + ) + if not user_statuses + else None + ), "rating": reviews.aggregate(Avg("rating"))["rating__avg"], "lists": lists, "update_error": kwargs.get("update_error", False), @@ -130,7 +141,7 @@ class Book(View): @require_POST def upload_cover(request, book_id): """upload a new cover""" - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) book.last_edited_by = request.user url = request.POST.get("cover-url") @@ -168,7 +179,7 @@ def set_cover_from_url(url): @permission_required("bookwyrm.edit_book", raise_exception=True) def add_description(request, book_id): """upload a new cover""" - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) description = request.POST.get("description") @@ -199,7 +210,9 @@ def update_book_from_remote(request, book_id, connector_identifier): connector = connector_manager.load_connector( get_object_or_404(models.Connector, identifier=connector_identifier) ) - book = get_object_or_404(models.Book.objects.select_subclasses(), id=book_id) + book = get_mergeable_object_or_404( + models.Book.objects.select_subclasses(), id=book_id + ) try: connector.update_book_from_remote(book) diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index ae492374f..b8ceece13 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -1,4 +1,5 @@ """ the good stuff! the books! """ + from re import sub, findall from django.contrib.auth.decorators import login_required, permission_required from django.contrib.postgres.search import SearchRank, SearchVector @@ -18,9 +19,10 @@ from bookwyrm.utils.isni import ( build_author_from_isni, augment_author_metadata, ) -from bookwyrm.views.helpers import get_edition +from bookwyrm.views.helpers import get_edition, get_mergeable_object_or_404 from .books import set_cover_from_url + # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( @@ -42,7 +44,7 @@ class EditBook(View): def post(self, request, book_id): """edit a book cool""" - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) form = forms.EditionForm(request.POST, request.FILES, instance=book) @@ -130,7 +132,7 @@ class CreateBook(View): with transaction.atomic(): book = form.save(request) - parent_work = get_object_or_404(models.Work, id=parent_work_id) + parent_work = get_mergeable_object_or_404(models.Work, id=parent_work_id) book.parent_work = parent_work if authors: @@ -295,7 +297,7 @@ class ConfirmEditBook(View): if not book.parent_work: work_match = request.POST.get("parent_work") if work_match and work_match != "0": - work = get_object_or_404(models.Work, id=work_match) + work = get_mergeable_object_or_404(models.Work, id=work_match) else: work = models.Work.objects.create(title=form.cleaned_data["title"]) work.authors.set(book.authors.all()) diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index a3167fac4..538ff6377 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -1,4 +1,5 @@ """ the good stuff! the books! """ + from functools import reduce import operator @@ -7,7 +8,7 @@ from django.core.cache import cache as django_cache from django.core.paginator import Paginator from django.db import transaction from django.db.models import Q -from django.shortcuts import get_object_or_404, redirect +from django.shortcuts import redirect from django.template.response import TemplateResponse from django.views import View from django.views.decorators.http import require_POST @@ -15,7 +16,7 @@ from django.views.decorators.http import require_POST from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.settings import PAGE_LENGTH -from bookwyrm.views.helpers import is_api_request +from bookwyrm.views.helpers import is_api_request, get_mergeable_object_or_404 # pylint: disable=no-self-use @@ -24,7 +25,7 @@ class Editions(View): def get(self, request, book_id): """list of editions of a book""" - work = get_object_or_404(models.Work, id=book_id) + work = get_mergeable_object_or_404(models.Work, id=book_id) if is_api_request(request): return ActivitypubResponse(work.to_edition_list(**request.GET)) @@ -83,7 +84,7 @@ class Editions(View): def switch_edition(request): """switch your copy of a book to a different edition""" edition_id = request.POST.get("edition") - new_edition = get_object_or_404(models.Edition, id=edition_id) + new_edition = get_mergeable_object_or_404(models.Edition, id=edition_id) shelfbooks = models.ShelfBook.objects.filter( book__parent_work=new_edition.parent_work, shelf__user=request.user ) diff --git a/bookwyrm/views/books/links.py b/bookwyrm/views/books/links.py index 70b91f2d9..4793c6019 100644 --- a/bookwyrm/views/books/links.py +++ b/bookwyrm/views/books/links.py @@ -1,4 +1,5 @@ """ the good stuff! the books! """ + from django.contrib.auth.decorators import login_required, permission_required from django.db import transaction from django.shortcuts import get_object_or_404, redirect @@ -8,6 +9,7 @@ from django.utils.decorators import method_decorator from django.views.decorators.http import require_POST from bookwyrm import forms, models +from bookwyrm.views.helpers import get_mergeable_object_or_404 # pylint: disable=no-self-use @@ -20,7 +22,7 @@ class BookFileLinks(View): def get(self, request, book_id): """view links""" - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) annotated_links = get_annotated_links(book) data = {"book": book, "links": annotated_links} @@ -36,7 +38,7 @@ class BookFileLinks(View): # this form shouldn't ever really get here, since it's just a dropdown # get the data again rather than redirecting - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) annotated_links = get_annotated_links(book, form=form) data = {"book": book, "links": annotated_links} @@ -75,7 +77,7 @@ class AddFileLink(View): def get(self, request, book_id): """Create link form""" - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) data = { "file_link_form": forms.FileLinkForm(), "book": book, @@ -85,7 +87,9 @@ class AddFileLink(View): @transaction.atomic def post(self, request, book_id, link_id=None): """Add a link to a copy of the book you can read""" - book = get_object_or_404(models.Book.objects.select_subclasses(), id=book_id) + book = get_mergeable_object_or_404( + models.Book.objects.select_subclasses(), id=book_id + ) link = get_object_or_404(models.FileLink, id=link_id) if link_id else None form = forms.FileLinkForm(request.POST, instance=link) if not form.is_valid(): diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index bdc8dccab..eb3a2a04f 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -1,10 +1,10 @@ """ books belonging to the same series """ + from sys import float_info from django.views import View -from django.shortcuts import get_object_or_404 from django.template.response import TemplateResponse -from bookwyrm.views.helpers import is_api_request +from bookwyrm.views.helpers import is_api_request, get_mergeable_object_or_404 from bookwyrm import models @@ -27,7 +27,7 @@ class BookSeriesBy(View): if is_api_request(request): pass - author = get_object_or_404(models.Author, id=author_id) + author = get_mergeable_object_or_404(models.Author, id=author_id) results = models.Edition.objects.filter(authors=author, series=series_name) @@ -56,9 +56,11 @@ class BookSeriesBy(View): sorted(numbered_books, key=sort_by_series) + sorted( dated_books, - key=lambda book: book.first_published_date - if book.first_published_date - else book.published_date, + key=lambda book: ( + book.first_published_date + if book.first_published_date + else book.published_date + ), ) + sorted( unsortable_books, diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py index 511a886ca..9a28dfbca 100644 --- a/bookwyrm/views/get_started.py +++ b/bookwyrm/views/get_started.py @@ -1,4 +1,5 @@ """ Helping new users figure out the lay of the land """ + import re from django.contrib.auth.decorators import login_required @@ -13,6 +14,7 @@ from django.views import View from bookwyrm import book_search, forms, models from bookwyrm.settings import INSTANCE_ACTOR_USERNAME from bookwyrm.suggested_users import suggested_users +from bookwyrm.views.helpers import get_mergeable_object_or_404 from .preferences.edit_user import save_user_form @@ -80,8 +82,8 @@ class GetStartedBooks(View): for k, v in request.POST.items() if re.match(r"\d+", k) and re.match(r"\d+", v) ] - for (book_id, shelf_id) in shelve_actions: - book = get_object_or_404(models.Edition, id=book_id) + for book_id, shelf_id in shelve_actions: + book = get_mergeable_object_or_404(models.Edition, id=book_id) shelf = get_object_or_404(models.Shelf, id=shelf_id) models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 60d950354..5bbb05033 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -1,4 +1,5 @@ """ helper functions used in various views """ + import re from datetime import datetime, timedelta import dateutil.parser @@ -8,7 +9,7 @@ from dateutil.parser import ParserError from requests import HTTPError from django.db.models import Q from django.conf import settings as django_settings -from django.shortcuts import redirect +from django.shortcuts import redirect, _get_queryset from django.http import Http404 from django.utils import translation @@ -232,3 +233,19 @@ def redirect_to_referer(request, *args, **kwargs): # if not, use the args passed you'd normally pass to redirect() return redirect(*args or "/", **kwargs) + + +# pylint: disable=redefined-builtin,invalid-name +def get_mergeable_object_or_404(klass, id): + """variant of get_object_or_404 that also redirects if id has been merged + into another object""" + queryset = _get_queryset(klass) + try: + return queryset.get(pk=id) + except queryset.model.DoesNotExist: + try: + return queryset.get(absorbed__deleted_id=id) + except queryset.model.DoesNotExist: + pass + + raise Http404(f"No {queryset.model} with ID {id} exists") diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py index 2ce59b096..478d27990 100644 --- a/bookwyrm/views/reading.py +++ b/bookwyrm/views/reading.py @@ -1,4 +1,5 @@ """ the good stuff! the books! """ + import logging from django.contrib.auth.decorators import login_required from django.core.cache import cache @@ -11,6 +12,7 @@ from django.views import View from django.views.decorators.http import require_POST from bookwyrm import forms, models +from bookwyrm.views.helpers import get_mergeable_object_or_404 from bookwyrm.views.shelf.shelf_actions import unshelve from .status import CreateStatus from .helpers import get_edition, handle_reading_status, is_api_request @@ -130,7 +132,7 @@ class ReadThrough(View): def get(self, request, book_id, readthrough_id=None): """standalone form in case of errors""" - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) form = forms.ReadThroughForm() data = {"form": form, "book": book} if readthrough_id: @@ -152,7 +154,7 @@ class ReadThrough(View): ) form = forms.ReadThroughForm(request.POST) if not form.is_valid(): - book = get_object_or_404(models.Edition, id=book_id) + book = get_mergeable_object_or_404(models.Edition, id=book_id) data = {"form": form, "book": book} if request.POST.get("id"): data["readthrough"] = get_object_or_404( diff --git a/bookwyrm/views/shelf/shelf_actions.py b/bookwyrm/views/shelf/shelf_actions.py index f0f5fa159..d68ea4219 100644 --- a/bookwyrm/views/shelf/shelf_actions.py +++ b/bookwyrm/views/shelf/shelf_actions.py @@ -1,11 +1,12 @@ """ shelf views """ + from django.db import IntegrityError, transaction from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404, redirect from django.views.decorators.http import require_POST from bookwyrm import forms, models -from bookwyrm.views.helpers import redirect_to_referer +from bookwyrm.views.helpers import redirect_to_referer, get_mergeable_object_or_404 @login_required @@ -36,7 +37,7 @@ def delete_shelf(request, shelf_id): @transaction.atomic def shelve(request): """put a book on a user's shelf""" - book = get_object_or_404(models.Edition, id=request.POST.get("book")) + book = get_mergeable_object_or_404(models.Edition, id=request.POST.get("book")) desired_shelf = get_object_or_404( request.user.shelf_set, identifier=request.POST.get("shelf") ) @@ -97,7 +98,7 @@ def shelve(request): def unshelve(request, book_id=False): """remove a book from a user's shelf""" identity = book_id if book_id else request.POST.get("book") - book = get_object_or_404(models.Edition, id=identity) + book = get_mergeable_object_or_404(models.Edition, id=identity) shelf_book = get_object_or_404( models.ShelfBook, book=book, shelf__id=request.POST["shelf"] ) diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 34b62d0b4..f2f03405f 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -1,4 +1,5 @@ """ what are we here for if not for posting """ + import re import logging @@ -19,6 +20,7 @@ from markdown import markdown from bookwyrm import forms, models from bookwyrm.models.report import DELETE_ITEM from bookwyrm.utils import regex, sanitizer +from bookwyrm.views.helpers import get_mergeable_object_or_404 from .helpers import handle_remote_webfinger, is_api_request from .helpers import load_date_in_user_tz_as_utc, redirect_to_referer @@ -52,7 +54,7 @@ class CreateStatus(View): def get(self, request, status_type): # pylint: disable=unused-argument """compose view (...not used?)""" - book = get_object_or_404(models.Edition, id=request.GET.get("book")) + book = get_mergeable_object_or_404(models.Edition, id=request.GET.get("book")) data = {"book": book} return TemplateResponse(request, "compose.html", data) @@ -98,7 +100,7 @@ class CreateStatus(View): # inspect the text for user tags content = status.content mentions = find_mentions(request.user, content) - for (_, mention_user) in mentions.items(): + for _, mention_user in mentions.items(): # add them to status mentions fk status.mention_users.add(mention_user) content = format_mentions(content, mentions) @@ -109,7 +111,7 @@ class CreateStatus(View): # inspect the text for hashtags hashtags = find_or_create_hashtags(content) - for (_, mention_hashtag) in hashtags.items(): + for _, mention_hashtag in hashtags.items(): # add them to status mentions fk status.mention_hashtags.add(mention_hashtag) content = format_hashtags(content, hashtags) @@ -140,7 +142,7 @@ class CreateStatus(View): def format_mentions(content, mentions): """Detect @mentions and make them links""" - for (mention_text, mention_user) in mentions.items(): + for mention_text, mention_user in mentions.items(): # turn the mention into a link content = re.sub( rf"(? Date: Sat, 2 Mar 2024 11:34:20 +0100 Subject: [PATCH 138/200] BookDataModel.merge_into: return and log absorbed fields --- .../management/commands/deduplicate_book_data.py | 3 ++- bookwyrm/management/merge_command.py | 4 +++- bookwyrm/models/book.py | 12 ++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bookwyrm/management/commands/deduplicate_book_data.py b/bookwyrm/management/commands/deduplicate_book_data.py index d2f4ef936..74475a00b 100644 --- a/bookwyrm/management/commands/deduplicate_book_data.py +++ b/bookwyrm/management/commands/deduplicate_book_data.py @@ -30,7 +30,8 @@ def dedupe_model(model): print(f"merging into {canonical.remote_id} based on {field.name} {value}:") for obj in objs[1:]: print(f"- {obj.remote_id}") - obj.merge_into(canonical) + absorbed_fields = obj.merge_into(canonical) + print(f" absorbed fields: {absorbed_fields}") class Command(BaseCommand): diff --git a/bookwyrm/management/merge_command.py b/bookwyrm/management/merge_command.py index 2f3f90c86..0c464600a 100644 --- a/bookwyrm/management/merge_command.py +++ b/bookwyrm/management/merge_command.py @@ -25,4 +25,6 @@ class MergeCommand(BaseCommand): print("other book doesn’t exist!") return - other.merge_into(canonical) + absorbed_fields = other.merge_into(canonical) + print(f"{other.remote_id} has been merged into {canonical.remote_id}") + print(f"absorbed fields: {absorbed_fields}") diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index c7235a3f5..d7193cbbe 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -2,7 +2,7 @@ from itertools import chain import re -from typing import Any +from typing import Any, Dict from typing_extensions import Self from django.contrib.postgres.search import SearchVectorField @@ -110,12 +110,12 @@ class BookDataModel(ObjectMixin, BookWyrmModel): """only send book data updates to other bookwyrm instances""" super().broadcast(activity, sender, software=software, **kwargs) - def merge_into(self, canonical: Self) -> None: + def merge_into(self, canonical: Self) -> Dict[str, Any]: """merge this entity into another entity""" if canonical.id == self.id: raise ValueError(f"Cannot merge {self} into itself") - canonical.absorb_data_from(self) + absorbed_fields = canonical.absorb_data_from(self) canonical.save() self.merged_model.objects.create(deleted_id=self.id, merged_into=canonical) @@ -147,9 +147,11 @@ class BookDataModel(ObjectMixin, BookWyrmModel): getattr(related_obj, related_field).remove(self) self.delete() + return absorbed_fields - def absorb_data_from(self, other: Self) -> None: + def absorb_data_from(self, other: Self) -> Dict[str, Any]: """fill empty fields with values from another entity""" + absorbed_fields = {} for data_field in self._meta.get_fields(): if not hasattr(data_field, "activitypub_field"): continue @@ -158,6 +160,8 @@ class BookDataModel(ObjectMixin, BookWyrmModel): continue if not getattr(self, data_field.name): setattr(self, data_field.name, data_value) + absorbed_fields[data_field.name] = data_value + return absorbed_fields class MergedBookDataModel(models.Model): From 7fb079cb43ed7260efd796ba65216790814617f4 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 5 Mar 2024 15:25:35 +0100 Subject: [PATCH 139/200] PartialDate: fix __eq__ method --- bookwyrm/utils/partial_date.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bookwyrm/utils/partial_date.py b/bookwyrm/utils/partial_date.py index 40b89c838..4c9391476 100644 --- a/bookwyrm/utils/partial_date.py +++ b/bookwyrm/utils/partial_date.py @@ -67,6 +67,14 @@ class PartialDate(datetime): # current_timezone and default_timezone. return cls.from_datetime(datetime(year, month, day, tzinfo=_westmost_tz)) + def __eq__(self, other: object) -> bool: + if not isinstance(other, PartialDate): + return NotImplemented + return self.partial_isoformat() == other.partial_isoformat() + + def __repr__(self) -> str: + return f"<{self.__class__.__name__} object: {self.partial_isoformat()}>" + class MonthParts(PartialDate): """a date bound into month precision""" From 6f191acb27a23e330cdadf829efebc61c3809477 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 5 Mar 2024 15:26:12 +0100 Subject: [PATCH 140/200] BookDataModel: fix absorbing data from array and partial date fields --- bookwyrm/models/book.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index d7193cbbe..607426189 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -155,12 +155,27 @@ class BookDataModel(ObjectMixin, BookWyrmModel): for data_field in self._meta.get_fields(): if not hasattr(data_field, "activitypub_field"): continue - data_value = getattr(other, data_field.name) - if not data_value: + canonical_value = getattr(self, data_field.name) + other_value = getattr(other, data_field.name) + if not other_value: continue - if not getattr(self, data_field.name): - setattr(self, data_field.name, data_value) - absorbed_fields[data_field.name] = data_value + if isinstance(data_field, fields.ArrayField): + if new_values := list(set(other_value) - set(canonical_value)): + # append at the end (in no particular order) + setattr(self, data_field.name, canonical_value + new_values) + absorbed_fields[data_field.name] = new_values + elif isinstance(data_field, fields.PartialDateField): + if ( + (not canonical_value) + or (other_value.has_day and not canonical_value.has_day) + or (other_value.has_month and not canonical_value.has_month) + ): + setattr(self, data_field.name, other_value) + absorbed_fields[data_field.name] = other_value + else: + if not canonical_value: + setattr(self, data_field.name, other_value) + absorbed_fields[data_field.name] = other_value return absorbed_fields From fb82c7a579752e68c098e31307aad22e5e07ce4c Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 5 Mar 2024 15:26:23 +0100 Subject: [PATCH 141/200] Add test for merging authors --- bookwyrm/tests/test_merge.py | 97 ++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 bookwyrm/tests/test_merge.py diff --git a/bookwyrm/tests/test_merge.py b/bookwyrm/tests/test_merge.py new file mode 100644 index 000000000..933751832 --- /dev/null +++ b/bookwyrm/tests/test_merge.py @@ -0,0 +1,97 @@ +"""test merging Authors, Works and Editions""" + +from django.test import TestCase +from django.test.client import Client + +from bookwyrm import models + + +class MergeBookDataModel(TestCase): + """test merging of subclasses of BookDataModel""" + + @classmethod + def setUpTestData(cls): # pylint: disable=invalid-name + """shared data""" + models.SiteSettings.objects.create() + + cls.jrr_tolkien = models.Author.objects.create( + name="J.R.R. Tolkien", + aliases=["JRR Tolkien", "Tolkien"], + bio="This guy wrote about hobbits and stuff.", + openlibrary_key="OL26320A", + isni="0000000121441970", + ) + cls.jrr_tolkien_2 = models.Author.objects.create( + name="J.R.R. Tolkien", + aliases=["JRR Tolkien", "John Ronald Reuel Tolkien"], + openlibrary_key="OL26320A", + isni="wrong", + wikidata="Q892", + ) + cls.jrr_tolkien_2_id = cls.jrr_tolkien_2.id + + # perform merges + cls.jrr_tolkien_absorbed_fields = cls.jrr_tolkien_2.merge_into(cls.jrr_tolkien) + + def test_merged_author(self): + """verify merged author after merge""" + self.assertEqual(self.jrr_tolkien_2.id, None, msg="duplicate should be deleted") + + def test_canonical_author(self): + """verify canonical author data after merge""" + + self.assertFalse( + self.jrr_tolkien.id is None, msg="canonical should not be deleted" + ) + + # identical in canonical and duplicate; should be unchanged + self.assertEqual(self.jrr_tolkien.name, "J.R.R. Tolkien") + self.assertEqual(self.jrr_tolkien.openlibrary_key, "OL26320A") + + # present in canonical and absent in duplicate; should be unchanged + self.assertEqual( + self.jrr_tolkien.bio, "This guy wrote about hobbits and stuff." + ) + + # absent in canonical and present in duplicate; should be absorbed + self.assertEqual(self.jrr_tolkien.wikidata, "Q892") + + # scalar value that is different in canonical and duplicate; should be unchanged + self.assertEqual(self.jrr_tolkien.isni, "0000000121441970") + + # set value with both matching and non-matching elements; should be the + # union of canonical and duplicate + self.assertEqual( + self.jrr_tolkien.aliases, + [ + "JRR Tolkien", + "Tolkien", + "John Ronald Reuel Tolkien", + ], + ) + + def test_merged_author_redirect(self): + """a web request for a merged author should redirect to the canonical author""" + client = Client() + response = client.get( + f"/author/{self.jrr_tolkien_2_id}/s/jrr-tolkien", follow=True + ) + self.assertEqual(response.redirect_chain, [(self.jrr_tolkien.local_path, 301)]) + + def test_merged_author_activitypub(self): + """an activitypub request for a merged author should return the data for + the canonical author (including the canonical id)""" + client = Client(HTTP_ACCEPT="application/json") + response = client.get(f"/author/{self.jrr_tolkien_2_id}") + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json(), self.jrr_tolkien.to_activity()) + + def test_absorbed_fields(self): + """reported absorbed_fields should be accurate for --dry_run""" + self.assertEqual( + self.jrr_tolkien_absorbed_fields, + { + "aliases": ["John Ronald Reuel Tolkien"], + "wikidata": "Q892", + }, + ) From 4a690e675ae4652b81932eb089949e6d2f13f3ae Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 5 Mar 2024 17:12:51 +0100 Subject: [PATCH 142/200] BookDataModel: add dry_run argument to merge_into --- .../commands/deduplicate_book_data.py | 23 ++++++++++++++----- bookwyrm/management/merge_command.py | 11 +++++++-- bookwyrm/models/book.py | 19 ++++++++++----- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/bookwyrm/management/commands/deduplicate_book_data.py b/bookwyrm/management/commands/deduplicate_book_data.py index 74475a00b..c2d897ce3 100644 --- a/bookwyrm/management/commands/deduplicate_book_data.py +++ b/bookwyrm/management/commands/deduplicate_book_data.py @@ -6,7 +6,7 @@ from django.db.models import Count from bookwyrm import models -def dedupe_model(model): +def dedupe_model(model, dry_run=False): """combine duplicate editions and update related models""" print(f"deduplicating {model.__name__}:") fields = model._meta.get_fields() @@ -27,10 +27,13 @@ def dedupe_model(model): print("----------") objs = model.objects.filter(**{field.name: value}).order_by("id") canonical = objs.first() - print(f"merging into {canonical.remote_id} based on {field.name} {value}:") + action = "would merge" if dry_run else "merging" + print( + f"{action} into {model.__name__} {canonical.remote_id} based on {field.name} {value}:" + ) for obj in objs[1:]: print(f"- {obj.remote_id}") - absorbed_fields = obj.merge_into(canonical) + absorbed_fields = obj.merge_into(canonical, dry_run=dry_run) print(f" absorbed fields: {absorbed_fields}") @@ -39,9 +42,17 @@ class Command(BaseCommand): help = "merges duplicate book data" + def add_arguments(self, parser): + """add the arguments for this command""" + parser.add_argument( + "--dry_run", + action="store_true", + help="don't actually merge, only print what would happen", + ) + # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run deduplications""" - dedupe_model(models.Edition) - dedupe_model(models.Work) - dedupe_model(models.Author) + dedupe_model(models.Edition, dry_run=options["dry_run"]) + dedupe_model(models.Work, dry_run=options["dry_run"]) + dedupe_model(models.Author, dry_run=options["dry_run"]) diff --git a/bookwyrm/management/merge_command.py b/bookwyrm/management/merge_command.py index 0c464600a..66e60814a 100644 --- a/bookwyrm/management/merge_command.py +++ b/bookwyrm/management/merge_command.py @@ -8,6 +8,11 @@ class MergeCommand(BaseCommand): """add the arguments for this command""" parser.add_argument("--canonical", type=int, required=True) parser.add_argument("--other", type=int, required=True) + parser.add_argument( + "--dry_run", + action="store_true", + help="don't actually merge, only print what would happen", + ) # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): @@ -25,6 +30,8 @@ class MergeCommand(BaseCommand): print("other book doesn’t exist!") return - absorbed_fields = other.merge_into(canonical) - print(f"{other.remote_id} has been merged into {canonical.remote_id}") + absorbed_fields = other.merge_into(canonical, dry_run=options["dry_run"]) + + action = "would be" if options["dry_run"] else "has been" + print(f"{other.remote_id} {action} merged into {canonical.remote_id}") print(f"absorbed fields: {absorbed_fields}") diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 607426189..5e46a3245 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -110,12 +110,16 @@ class BookDataModel(ObjectMixin, BookWyrmModel): """only send book data updates to other bookwyrm instances""" super().broadcast(activity, sender, software=software, **kwargs) - def merge_into(self, canonical: Self) -> Dict[str, Any]: + def merge_into(self, canonical: Self, dry_run=False) -> Dict[str, Any]: """merge this entity into another entity""" if canonical.id == self.id: raise ValueError(f"Cannot merge {self} into itself") - absorbed_fields = canonical.absorb_data_from(self) + absorbed_fields = canonical.absorb_data_from(self, dry_run=dry_run) + + if dry_run: + return absorbed_fields + canonical.save() self.merged_model.objects.create(deleted_id=self.id, merged_into=canonical) @@ -149,7 +153,7 @@ class BookDataModel(ObjectMixin, BookWyrmModel): self.delete() return absorbed_fields - def absorb_data_from(self, other: Self) -> Dict[str, Any]: + def absorb_data_from(self, other: Self, dry_run=False) -> Dict[str, Any]: """fill empty fields with values from another entity""" absorbed_fields = {} for data_field in self._meta.get_fields(): @@ -162,7 +166,8 @@ class BookDataModel(ObjectMixin, BookWyrmModel): if isinstance(data_field, fields.ArrayField): if new_values := list(set(other_value) - set(canonical_value)): # append at the end (in no particular order) - setattr(self, data_field.name, canonical_value + new_values) + if not dry_run: + setattr(self, data_field.name, canonical_value + new_values) absorbed_fields[data_field.name] = new_values elif isinstance(data_field, fields.PartialDateField): if ( @@ -170,11 +175,13 @@ class BookDataModel(ObjectMixin, BookWyrmModel): or (other_value.has_day and not canonical_value.has_day) or (other_value.has_month and not canonical_value.has_month) ): - setattr(self, data_field.name, other_value) + if not dry_run: + setattr(self, data_field.name, other_value) absorbed_fields[data_field.name] = other_value else: if not canonical_value: - setattr(self, data_field.name, other_value) + if not dry_run: + setattr(self, data_field.name, other_value) absorbed_fields[data_field.name] = other_value return absorbed_fields From 2d2ccd51df4801d2219ad46c2d7bff99d9afc6c3 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 23 Mar 2024 19:35:24 +0100 Subject: [PATCH 143/200] Factor out book series info into separate template --- bookwyrm/templates/snippets/book_series.html | 3 +++ bookwyrm/templates/snippets/book_titleby.html | 8 ++------ bookwyrm/templates/snippets/status/headers/comment.html | 4 +--- bookwyrm/templates/snippets/status/headers/quotation.html | 4 +--- bookwyrm/templates/snippets/status/headers/read.html | 4 +--- bookwyrm/templates/snippets/status/headers/reading.html | 4 +--- bookwyrm/templates/snippets/status/headers/review.html | 4 +--- .../snippets/status/headers/stopped_reading.html | 4 +--- bookwyrm/templates/snippets/status/headers/to_read.html | 4 +--- 9 files changed, 12 insertions(+), 27 deletions(-) create mode 100644 bookwyrm/templates/snippets/book_series.html diff --git a/bookwyrm/templates/snippets/book_series.html b/bookwyrm/templates/snippets/book_series.html new file mode 100644 index 000000000..fd1343604 --- /dev/null +++ b/bookwyrm/templates/snippets/book_series.html @@ -0,0 +1,3 @@ +{% if book.series %} +({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) +{% endif %} diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html index 35e0c4c45..518d96389 100644 --- a/bookwyrm/templates/snippets/book_titleby.html +++ b/bookwyrm/templates/snippets/book_titleby.html @@ -9,8 +9,7 @@ {% if book.authors.exists %} {% blocktrans trimmed with path=book.local_path title=book|book_title %} -{{ title }} - +{{ title }} by {% endblocktrans %} {% include 'snippets/authors.html' with book=book limit=3 %} @@ -18,10 +17,7 @@ by {{ book|book_title }} {% endif %} -{% if book.series %} -({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) -{% endif %} - +{% include 'snippets/book_series.html' with book=book %} {% endcache %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/comment.html b/bookwyrm/templates/snippets/status/headers/comment.html index b7750d3df..72bf5b255 100644 --- a/bookwyrm/templates/snippets/status/headers/comment.html +++ b/bookwyrm/templates/snippets/status/headers/comment.html @@ -18,8 +18,6 @@ commented on {{ book }} {% endif %} -{% if book.series %} -({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) -{% endif %} +{% include 'snippets/book_series.html' with book=book %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/quotation.html b/bookwyrm/templates/snippets/status/headers/quotation.html index 3ddd20291..ce0ea5923 100644 --- a/bookwyrm/templates/snippets/status/headers/quotation.html +++ b/bookwyrm/templates/snippets/status/headers/quotation.html @@ -18,8 +18,6 @@ quoted {{ book }} {% endif %} -{% if book.series %} -({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) -{% endif %} +{% include 'snippets/book_series.html' with book=book %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/read.html b/bookwyrm/templates/snippets/status/headers/read.html index 8c323dac6..5a237a836 100644 --- a/bookwyrm/templates/snippets/status/headers/read.html +++ b/bookwyrm/templates/snippets/status/headers/read.html @@ -20,8 +20,6 @@ finished reading {{ book }} {% endif %} -{% if book.series %} -({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) -{% endif %} +{% include 'snippets/book_series.html' with book=book %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/reading.html b/bookwyrm/templates/snippets/status/headers/reading.html index 73e96ebbc..44c604620 100644 --- a/bookwyrm/templates/snippets/status/headers/reading.html +++ b/bookwyrm/templates/snippets/status/headers/reading.html @@ -20,8 +20,6 @@ started reading {{ book }} {% endif %} -{% if book.series %} -({{book.series}} {%if book.series_number %}#{{book.series_number}}) {% endif %} -{% endif %} +{% include 'snippets/book_series.html' with book=book %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/review.html b/bookwyrm/templates/snippets/status/headers/review.html index 0bdcd29b1..95a6fc403 100644 --- a/bookwyrm/templates/snippets/status/headers/review.html +++ b/bookwyrm/templates/snippets/status/headers/review.html @@ -18,8 +18,6 @@ reviewed {{ book }} {% endif %} -{% if book.series %} -({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) -{% endif %} +{% include 'snippets/book_series.html' with book=book %} {% endwith %} diff --git a/bookwyrm/templates/snippets/status/headers/stopped_reading.html b/bookwyrm/templates/snippets/status/headers/stopped_reading.html index a00be181c..09f2e4264 100644 --- a/bookwyrm/templates/snippets/status/headers/stopped_reading.html +++ b/bookwyrm/templates/snippets/status/headers/stopped_reading.html @@ -20,9 +20,7 @@ stopped reading {{ book }} {% endif %} -{% if book.series %} -({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) -{% endif %} +{% include 'snippets/book_series.html' with book=book %} {% endspaceless %} diff --git a/bookwyrm/templates/snippets/status/headers/to_read.html b/bookwyrm/templates/snippets/status/headers/to_read.html index 4d1b2ab1b..c775c33a7 100644 --- a/bookwyrm/templates/snippets/status/headers/to_read.html +++ b/bookwyrm/templates/snippets/status/headers/to_read.html @@ -20,8 +20,6 @@ wants to read {{ book }} {% endif %} -{% if book.series %} -({{book.series}}{%if book.series_number %}, #{{book.series_number}}{% endif %}) -{% endif %} +{% include 'snippets/book_series.html' with book=book %} {% endspaceless %} From 592914dc91aad1a2a96c90321eef1006a9d4a060 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 23 Mar 2024 19:51:20 +0100 Subject: [PATCH 144/200] Render series number with comma and outside of link on book page --- bookwyrm/templates/book/book.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 4c345832e..83500a54b 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -45,18 +45,22 @@ {% endif %} {% if book.series %} - + {% spaceless %} {% if book.authors.exists %} {% endif %} + {% if book.series_number %} + , # + {{ book.series_number }} + {% endif %} + {% endspaceless %} {% endif %}

    {% endif %} From dd27684d4bc876a8de9360cdb5ac10054ccf427b Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 24 Mar 2024 20:53:49 +1100 Subject: [PATCH 145/200] set signed s3 url expiry with env value Adds S3_SIGNED_URL_EXPIRY val to .env and settings (defaults to 15 mins) Note that this is reset every time the user loads the exports page and is independent of the _creation_ of export files. --- .env.example | 3 +++ bookwyrm/settings.py | 1 + bookwyrm/views/preferences/export.py | 15 +++++++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 1bf6d5406..ee2ccd45a 100644 --- a/.env.example +++ b/.env.example @@ -71,6 +71,9 @@ ENABLE_THUMBNAIL_GENERATION=true USE_S3=false AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= +# seconds for signed S3 urls to expire +# this is currently only used for user export files +S3_SIGNED_URL_EXPIRY=900 # 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 diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 77bec0d8e..d2ba490b7 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -375,6 +375,7 @@ if USE_HTTPS: USE_S3 = env.bool("USE_S3", False) USE_AZURE = env.bool("USE_AZURE", False) +S3_SIGNED_URL_EXPIRY = env.int("S3_SIGNED_URL_EXPIRY", 900) if USE_S3: # AWS settings diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 54d6df261..09b43155b 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -146,7 +146,12 @@ class Export(View): # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class ExportUser(View): - """Let users export user data to import into another Bookwyrm instance""" + """ + Let users export user data to import into another Bookwyrm instance + This view creates signed URLs to pre-processed export files in + s3 storage on load (if they exist) and allows the user to create + a new file. + """ def get(self, request): """Request tar file""" @@ -166,8 +171,10 @@ class ExportUser(View): # for s3 we download directly from s3, so we need a signed url export["url"] = S3Boto3Storage.url( - storage, f"/exports/{job.task_id}.tar.gz", expire=900 - ) # temporarily downloadable file, expires after 5 minutes + storage, + f"/exports/{job.task_id}.tar.gz", + expire=settings.S3_SIGNED_URL_EXPIRY, + ) # for s3 we create a new tar file in s3, # so we need to check the size of _that_ file @@ -207,7 +214,7 @@ class ExportUser(View): return TemplateResponse(request, "preferences/export-user.html", data) def post(self, request): - """Download the json file of a user's data""" + """Trigger processing of a new user export file""" job = BookwyrmExportJob.objects.create(user=request.user) job.start_job() From 03587dfdc7ec1113151d8d7049e460e5c8ae6722 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 24 Mar 2024 20:56:20 +1100 Subject: [PATCH 146/200] migrations --- .../migrations/0197_merge_20240324_0235.py | 13 +++++++++++ ...198_alter_bookwyrmexportjob_export_data.py | 23 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 bookwyrm/migrations/0197_merge_20240324_0235.py create mode 100644 bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py diff --git a/bookwyrm/migrations/0197_merge_20240324_0235.py b/bookwyrm/migrations/0197_merge_20240324_0235.py new file mode 100644 index 000000000..a7c01a955 --- /dev/null +++ b/bookwyrm/migrations/0197_merge_20240324_0235.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.25 on 2024-03-24 02:35 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0196_merge_20240318_1737"), + ("bookwyrm", "0196_merge_pr3134_into_main"), + ] + + operations = [] diff --git a/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py b/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py new file mode 100644 index 000000000..95eddb278 --- /dev/null +++ b/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.25 on 2024-03-24 08:53 + +import bookwyrm.storage_backends +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0197_merge_20240324_0235"), + ] + + operations = [ + migrations.AlterField( + model_name="bookwyrmexportjob", + name="export_data", + field=models.FileField( + null=True, + storage=bookwyrm.storage_backends.ExportsS3Storage, + upload_to="", + ), + ), + ] From 7c2fa746ae3c1b0560c2a4411237a688ee513ce5 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 24 Mar 2024 11:23:23 +0100 Subject: [PATCH 147/200] Revert "docker-compose.yml: make all bind mounts read only" This reverts commit 864304f128fc897348342ba83506441469e8fe53. --- docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 034cc2677..71a844ba2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: networks: - main volumes: - - ./nginx:/etc/nginx/conf.d:ro + - ./nginx:/etc/nginx/conf.d - static_volume:/app/static - media_volume:/app/images db: @@ -26,7 +26,7 @@ services: env_file: .env command: python manage.py runserver 0.0.0.0:8000 volumes: - - .:/app:ro + - .:/app - static_volume:/app/static - media_volume:/app/images depends_on: @@ -41,7 +41,7 @@ services: image: redis:7.2.1 command: redis-server --requirepass ${REDIS_ACTIVITY_PASSWORD} --appendonly yes --port ${REDIS_ACTIVITY_PORT} volumes: - - ./redis.conf:/etc/redis/redis.conf:ro + - ./redis.conf:/etc/redis/redis.conf - redis_activity_data:/data env_file: .env networks: @@ -51,7 +51,7 @@ services: image: redis:7.2.1 command: redis-server --requirepass ${REDIS_BROKER_PASSWORD} --appendonly yes --port ${REDIS_BROKER_PORT} volumes: - - ./redis.conf:/etc/redis/redis.conf:ro + - ./redis.conf:/etc/redis/redis.conf - redis_broker_data:/data env_file: .env networks: @@ -64,7 +64,7 @@ services: - main command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc volumes: - - .:/app:ro + - .:/app - static_volume:/app/static - media_volume:/app/images depends_on: @@ -78,7 +78,7 @@ services: - main command: celery -A celerywyrm beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler volumes: - - .:/app:ro + - .:/app - static_volume:/app/static - media_volume:/app/images depends_on: @@ -89,7 +89,7 @@ services: command: celery -A celerywyrm flower --basic_auth=${FLOWER_USER}:${FLOWER_PASSWORD} --url_prefix=flower env_file: .env volumes: - - .:/app:ro + - .:/app - static_volume:/app/static networks: - main @@ -102,7 +102,7 @@ services: env_file: .env volumes: - /app/dev-tools/ - - .:/app:rw + - .:/app profiles: - tools volumes: From 69f464418d9eecb83823a1f2bb88a6254515abf2 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 24 Mar 2024 12:06:42 +0100 Subject: [PATCH 148/200] Remove problematic migration This migration is dependent on the runtime configuration (.env); a structural fix will follow. --- ...198_alter_bookwyrmexportjob_export_data.py | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py diff --git a/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py b/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py deleted file mode 100644 index 95eddb278..000000000 --- a/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.25 on 2024-03-24 08:53 - -import bookwyrm.storage_backends -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0197_merge_20240324_0235"), - ] - - operations = [ - migrations.AlterField( - model_name="bookwyrmexportjob", - name="export_data", - field=models.FileField( - null=True, - storage=bookwyrm.storage_backends.ExportsS3Storage, - upload_to="", - ), - ), - ] From 073f62d5bb449cf5a4cbb2c85de320fc8e9dc382 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 24 Mar 2024 11:51:37 +0100 Subject: [PATCH 149/200] Add exports_volume to docker-compose.yml Exports should be written to a Docker volume instead of to the bind mount (= source directory). This way they are shared between different containers even when they run on different machines. --- docker-compose.yml | 4 ++++ exports/.gitkeep | 0 2 files changed, 4 insertions(+) create mode 100644 exports/.gitkeep diff --git a/docker-compose.yml b/docker-compose.yml index 71a844ba2..634c021b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,7 @@ services: - .:/app - static_volume:/app/static - media_volume:/app/images + - exports_volume:/app/exports depends_on: - db - celery_worker @@ -67,6 +68,7 @@ services: - .:/app - static_volume:/app/static - media_volume:/app/images + - exports_volume:/app/exports depends_on: - db - redis_broker @@ -81,6 +83,7 @@ services: - .:/app - static_volume:/app/static - media_volume:/app/images + - exports_volume:/app/exports depends_on: - celery_worker restart: on-failure @@ -109,6 +112,7 @@ volumes: pgdata: static_volume: media_volume: + exports_volume: redis_broker_data: redis_activity_data: networks: diff --git a/exports/.gitkeep b/exports/.gitkeep new file mode 100644 index 000000000..e69de29bb From 471233c1dc6aa6aa3539a53a3f03641c103e5ed0 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 24 Mar 2024 12:22:17 +0100 Subject: [PATCH 150/200] Use different export job fields for the different storage backends This way, the database definition is not depdendent on the runtime configuration. --- .../0198_export_job_separate_file_fields.py | 28 +++++++++++++++++++ bookwyrm/models/bookwyrm_export_job.py | 27 ++++++++++++++---- 2 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 bookwyrm/migrations/0198_export_job_separate_file_fields.py diff --git a/bookwyrm/migrations/0198_export_job_separate_file_fields.py b/bookwyrm/migrations/0198_export_job_separate_file_fields.py new file mode 100644 index 000000000..d9dd87eee --- /dev/null +++ b/bookwyrm/migrations/0198_export_job_separate_file_fields.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.25 on 2024-03-24 11:20 + +import bookwyrm.storage_backends +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0197_merge_20240324_0235"), + ] + + operations = [ + migrations.RenameField( + model_name="bookwyrmexportjob", + old_name="export_data", + new_name="export_data_file", + ), + migrations.AddField( + model_name="bookwyrmexportjob", + name="export_data_s3", + field=models.FileField( + null=True, + storage=bookwyrm.storage_backends.ExportsS3Storage, + upload_to="", + ), + ), + ] diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 0cb726aa1..1e64b389f 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -37,15 +37,30 @@ class BookwyrmAwsSession(BotoSession): class BookwyrmExportJob(ParentJob): """entry for a specific request to export a bookwyrm user""" - if settings.USE_S3: - storage = storage_backends.ExportsS3Storage - else: - storage = storage_backends.ExportsFileStorage + # Only one of these fields is used, dependent on the configuration. + export_data_file = FileField(null=True, storage=storage_backends.ExportsFileStorage) + export_data_s3 = FileField(null=True, storage=storage_backends.ExportsS3Storage) - export_data = FileField(null=True, storage=storage) export_json = JSONField(null=True, encoder=DjangoJSONEncoder) json_completed = BooleanField(default=False) + @property + def export_data(self): + """returns the file field of the configured storage backend""" + # TODO: We could check whether a field for a different backend is + # filled, to support migrating to a different backend. + if settings.USE_S3: + return self.export_data_s3 + return self.export_data_file + + @export_data.setter + def export_data(self, value): + """sets the file field of the configured storage backend""" + if settings.USE_S3: + self.export_data_s3 = value + else: + self.export_data_file = value + def start_job(self): """Start the job""" @@ -284,7 +299,7 @@ def start_export_task(**kwargs): # prepare the initial file and base json job.export_data = ContentFile(b"", str(uuid4())) job.export_json = job.user.to_activity() - job.save(update_fields=["export_data", "export_json"]) + job.save(update_fields=["export_data_file", "export_data_s3", "export_json"]) # let's go json_export.delay(job_id=job.id, job_user=job.user.id, no_children=False) From ab7b0893e0106a7a01cb727e35d31cd8faaf8fe6 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 24 Mar 2024 12:47:26 +0100 Subject: [PATCH 151/200] User exports: handle files that no longer exist on file storage --- bookwyrm/views/preferences/export.py | 30 ++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 09b43155b..5ff0d8616 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -6,16 +6,17 @@ import io from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.db.models import Q -from django.http import HttpResponse +from django.http import HttpResponse, HttpResponseServerError, Http404 from django.template.response import TemplateResponse from django.utils import timezone from django.views import View from django.utils.decorators import method_decorator +from django.utils.translation import gettext_lazy as _ from django.shortcuts import redirect from storages.backends.s3boto3 import S3Boto3Storage -from bookwyrm import models +from bookwyrm import models, storage_backends from bookwyrm.models.bookwyrm_export_job import BookwyrmExportJob from bookwyrm import settings @@ -187,7 +188,11 @@ class ExportUser(View): else: # for local storage export_data is the tar file - export["size"] = job.export_data.size if job.export_data else 0 + try: + export["size"] = job.export_data.size if job.export_data else 0 + except FileNotFoundError: + # file no longer exists + export["size"] = 0 exports.append(export) @@ -230,10 +235,15 @@ class ExportArchive(View): def get(self, request, archive_id): """download user export file""" export = BookwyrmExportJob.objects.get(task_id=archive_id, user=request.user) - return HttpResponse( - export.export_data, - content_type="application/gzip", - headers={ - "Content-Disposition": 'attachment; filename="bookwyrm-account-export.tar.gz"' # pylint: disable=line-too-long - }, - ) + if isinstance(export.export_data.storage, storage_backends.ExportsFileStorage): + try: + return HttpResponse( + export.export_data, + content_type="application/gzip", + headers={ + "Content-Disposition": 'attachment; filename="bookwyrm-account-export.tar.gz"' # pylint: disable=line-too-long + }, + ) + except FileNotFoundError: + raise Http404() + return HttpResponseServerError() From 5bd66cb3f7a08669c9608a0e15afc18ed5cb7d43 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 24 Mar 2024 13:03:47 +0100 Subject: [PATCH 152/200] Only generate signed S3 link to user export when user clicks download --- .../templates/preferences/export-user.html | 30 ++++++------------- bookwyrm/views/preferences/export.py | 29 ++++++++++++------ 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/bookwyrm/templates/preferences/export-user.html b/bookwyrm/templates/preferences/export-user.html index 26cd292e8..13fe16a77 100644 --- a/bookwyrm/templates/preferences/export-user.html +++ b/bookwyrm/templates/preferences/export-user.html @@ -126,27 +126,15 @@ {{ export.size|get_file_size }} - {% if export.job.complete and not export.job.status == "stopped" and not export.job.status == "failed" %} - {% if export.url%} -

    - - - - {% trans "Download your export" %} - - -

    - {% else %} -

    - - - - {% trans "Download your export" %} - - -

    - {% endif %} - + {% if export.url %} + + + + {% trans "Download your export" %} + + + {% elif export.job.complete and not export.job.status == "stopped" and not export.job.status == "failed" %} + {% trans "Archive is no longer available" %} {% endif %} diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 5ff0d8616..50641e86e 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -10,6 +10,7 @@ from django.http import HttpResponse, HttpResponseServerError, Http404 from django.template.response import TemplateResponse from django.utils import timezone from django.views import View +from django.urls import reverse from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _ from django.shortcuts import redirect @@ -166,17 +167,8 @@ class ExportUser(View): export = {"job": job} if settings.USE_S3: - # make custom_domain None so we can sign the url - # see https://github.com/jschneier/django-storages/issues/944 storage = S3Boto3Storage(querystring_auth=True, custom_domain=None) - # for s3 we download directly from s3, so we need a signed url - export["url"] = S3Boto3Storage.url( - storage, - f"/exports/{job.task_id}.tar.gz", - expire=settings.S3_SIGNED_URL_EXPIRY, - ) - # for s3 we create a new tar file in s3, # so we need to check the size of _that_ file try: @@ -194,6 +186,9 @@ class ExportUser(View): # file no longer exists export["size"] = 0 + if export["size"] > 0: + export["url"] = reverse("prefs-export-file", args=[job.task_id]) + exports.append(export) site = models.SiteSettings.objects.get() @@ -235,6 +230,21 @@ class ExportArchive(View): def get(self, request, archive_id): """download user export file""" export = BookwyrmExportJob.objects.get(task_id=archive_id, user=request.user) + + if isinstance(export.export_data.storage, storage_backends.ExportsS3Storage): + # make custom_domain None so we can sign the url + # see https://github.com/jschneier/django-storages/issues/944 + storage = S3Boto3Storage(querystring_auth=True, custom_domain=None) + try: + url = S3Boto3Storage.url( + storage, + f"/exports/{export.task_id}.tar.gz", + expire=settings.S3_SIGNED_URL_EXPIRY, + ) + except Exception: + raise Http404() + return redirect(url) + if isinstance(export.export_data.storage, storage_backends.ExportsFileStorage): try: return HttpResponse( @@ -246,4 +256,5 @@ class ExportArchive(View): ) except FileNotFoundError: raise Http404() + return HttpResponseServerError() From aee8dc16af13e0ba421e746f355da740bf778f6d Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sun, 24 Mar 2024 13:27:01 +0100 Subject: [PATCH 153/200] Fix pylint warning --- bookwyrm/views/preferences/export.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 50641e86e..1d77e1200 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -12,7 +12,6 @@ from django.utils import timezone from django.views import View from django.urls import reverse from django.utils.decorators import method_decorator -from django.utils.translation import gettext_lazy as _ from django.shortcuts import redirect from storages.backends.s3boto3 import S3Boto3Storage From e0decbfd1d2a325354d5d93ad643d015f7003f59 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 25 Mar 2024 17:59:39 +0100 Subject: [PATCH 154/200] Fix urlescaped relative path to cover image in export Fixes #3292 --- bookwyrm/models/bookwyrm_export_job.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 1e64b389f..de96fb421 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -2,6 +2,7 @@ import logging from uuid import uuid4 +from urllib.parse import urlparse, unquote from boto3.session import Session as BotoSession from s3_tar import S3Tar @@ -97,6 +98,12 @@ class BookwyrmExportJob(ParentJob): self.complete_job() +def url2relativepath(url: str) -> str: + """turn an absolute URL into a relative filesystem path""" + parsed = urlparse(url) + return unquote(parsed.path[1:]) + + class AddBookToUserExportJob(ChildJob): """append book metadata for each book in an export""" @@ -112,9 +119,9 @@ class AddBookToUserExportJob(ChildJob): book["edition"] = self.edition.to_activity() if book["edition"].get("cover"): - # change the URL to be relative to the JSON file - filename = book["edition"]["cover"]["url"].rsplit("/", maxsplit=1)[-1] - book["edition"]["cover"]["url"] = f"covers/{filename}" + book["edition"]["cover"]["url"] = url2relativepath( + book["edition"]["cover"]["url"] + ) # authors book["authors"] = [] From a51402241babf51ac213a6582a819e1022143983 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 25 Mar 2024 18:14:00 +0100 Subject: [PATCH 155/200] Refactor creation of user export archive --- bookwyrm/models/bookwyrm_export_job.py | 99 +++++++++++++------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index de96fb421..8e3927b73 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -1,7 +1,6 @@ """Export user account to tar.gz file for import into another Bookwyrm instance""" import logging -from uuid import uuid4 from urllib.parse import urlparse, unquote from boto3.session import Session as BotoSession @@ -225,64 +224,68 @@ class AddFileToTar(ChildJob): # Using a series of jobs in a loop would be better try: - export_data = self.parent_export_job.export_data - export_json = self.parent_export_job.export_json - json_data = DjangoJSONEncoder().encode(export_json) - user = self.parent_export_job.user + export_job = self.parent_export_job + export_task_id = str(export_job.task_id) + + export_json_bytes = ( + DjangoJSONEncoder().encode(export_job.export_json).encode("utf-8") + ) + + user = export_job.user editions = get_books_for_user(user) - # filenames for later - export_data_original = str(export_data) - filename = str(self.parent_export_job.task_id) - if settings.USE_S3: - s3_job = S3Tar( + # Connection for writing temporary files + s3 = S3Boto3Storage() + + # Handle for creating the final archive + s3_archive_path = f"exports/{export_task_id}.tar.gz" + s3_tar = S3Tar( settings.AWS_STORAGE_BUCKET_NAME, - f"exports/{filename}.tar.gz", + s3_archive_path, session=BookwyrmAwsSession(), ) - # save json file - export_data.save( - f"archive_{filename}.json", ContentFile(json_data.encode("utf-8")) + # Save JSON file to a temporary location + export_json_tmp_file = f"exports/{export_task_id}/archive.json" + S3Boto3Storage.save( + s3, + export_json_tmp_file, + ContentFile(export_json_bytes), ) - s3_job.add_file(f"exports/{export_data.name}") + s3_tar.add_file(export_json_tmp_file) - # save image file - file_type = user.avatar.name.rsplit(".", maxsplit=1)[-1] - export_data.save(f"avatar_{filename}.{file_type}", user.avatar) - s3_job.add_file(f"exports/{export_data.name}") + # Add avatar image if present + if user.avatar: + s3_tar.add_file(f"images/{user.avatar.name}") - for book in editions: - if getattr(book, "cover", False): - cover_name = f"images/{book.cover.name}" - s3_job.add_file(cover_name, folder="covers") + for edition in editions: + if edition.cover: + s3_tar.add_file(f"images/{edition.cover.name}") - s3_job.tar() + # Create archive and store file name + s3_tar.tar() + export_job.export_data_s3 = s3_archive_path + export_job.save() - # delete child files - we don't need them any more - s3_storage = S3Boto3Storage(querystring_auth=True, custom_domain=None) - S3Boto3Storage.delete(s3_storage, f"exports/{export_data_original}") - S3Boto3Storage.delete(s3_storage, f"exports/archive_{filename}.json") - S3Boto3Storage.delete( - s3_storage, f"exports/avatar_{filename}.{file_type}" - ) + # Delete temporary files + S3Boto3Storage.delete(s3, export_json_tmp_file) else: - export_data.open("wb") - with BookwyrmTarFile.open(mode="w:gz", fileobj=export_data) as tar: + export_job.export_data_file = f"{export_task_id}.tar.gz" + with export_job.export_data_file.open("wb") as f: + with BookwyrmTarFile.open(mode="w:gz", fileobj=f) as tar: + # save json file + tar.write_bytes(export_json_bytes) - tar.write_bytes(json_data.encode("utf-8")) + # Add avatar image if present + if user.avatar: + tar.add_image(user.avatar, directory="images/") - # Add avatar image if present - if getattr(user, "avatar", False): - tar.add_image(user.avatar, filename="avatar") - - for book in editions: - if getattr(book, "cover", False): - tar.add_image(book.cover) - - export_data.close() + for edition in editions: + if edition.cover: + tar.add_image(edition.cover, directory="images/") + export_job.save() self.complete_job() @@ -304,9 +307,8 @@ def start_export_task(**kwargs): try: # prepare the initial file and base json - job.export_data = ContentFile(b"", str(uuid4())) job.export_json = job.user.to_activity() - job.save(update_fields=["export_data_file", "export_data_s3", "export_json"]) + job.save(update_fields=["export_json"]) # let's go json_export.delay(job_id=job.id, job_user=job.user.id, no_children=False) @@ -374,10 +376,9 @@ def json_export(**kwargs): if not job.export_json.get("icon"): job.export_json["icon"] = {} else: - # change the URL to be relative to the JSON file - file_type = job.export_json["icon"]["url"].rsplit(".", maxsplit=1)[-1] - filename = f"avatar.{file_type}" - job.export_json["icon"]["url"] = filename + job.export_json["icon"]["url"] = url2relativepath( + job.export_json["icon"]["url"] + ) # Additional settings - can't be serialized as AP vals = [ From f721289b1da1499db0c8f2c13fab9faba41c5fc8 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 25 Mar 2024 18:13:09 +0100 Subject: [PATCH 156/200] Simplify logic for rendering user exports --- .../templates/preferences/export-user.html | 4 ++- bookwyrm/views/preferences/export.py | 28 ++++++------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/bookwyrm/templates/preferences/export-user.html b/bookwyrm/templates/preferences/export-user.html index 13fe16a77..bd675afaa 100644 --- a/bookwyrm/templates/preferences/export-user.html +++ b/bookwyrm/templates/preferences/export-user.html @@ -123,7 +123,9 @@ + {% if export.size %} {{ export.size|get_file_size }} + {% endif %} {% if export.url %} @@ -133,7 +135,7 @@ {% trans "Download your export" %} - {% elif export.job.complete and not export.job.status == "stopped" and not export.job.status == "failed" %} + {% elif export.unavailable %} {% trans "Archive is no longer available" %} {% endif %} diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 1d77e1200..f501f331b 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -165,28 +165,16 @@ class ExportUser(View): for job in jobs: export = {"job": job} - if settings.USE_S3: - storage = S3Boto3Storage(querystring_auth=True, custom_domain=None) - - # for s3 we create a new tar file in s3, - # so we need to check the size of _that_ file + if job.export_data: try: - export["size"] = S3Boto3Storage.size( - storage, f"exports/{job.task_id}.tar.gz" - ) - except Exception: # pylint: disable=broad-except - export["size"] = 0 - - else: - # for local storage export_data is the tar file - try: - export["size"] = job.export_data.size if job.export_data else 0 + export["size"] = job.export_data.size + export["url"] = reverse("prefs-export-file", args=[job.task_id]) except FileNotFoundError: - # file no longer exists - export["size"] = 0 - - if export["size"] > 0: - export["url"] = reverse("prefs-export-file", args=[job.task_id]) + # file no longer exists locally + export["unavailable"] = True + except Exception: # pylint: disable=broad-except + # file no longer exists on storage backend + export["unavailable"] = True exports.append(export) From bd95bcd50b4822fc0fe196253a993a9fca52315c Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 25 Mar 2024 18:14:14 +0100 Subject: [PATCH 157/200] Add test for special character in cover filename --- .../tests/models/test_bookwyrm_export_job.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index 267d30217..1e0f6a39f 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -1,7 +1,13 @@ """test bookwyrm user export functions""" import datetime +from io import BytesIO +import pathlib + from unittest.mock import patch +from PIL import Image + +from django.core.files.base import ContentFile from django.utils import timezone from django.test import TestCase @@ -86,6 +92,15 @@ class BookwyrmExportJob(TestCase): title="Example Edition", parent_work=self.work ) + # edition cover + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + image.save(output, format=image.format) + self.edition.cover.save("tèst.jpg", ContentFile(output.getvalue())) + self.edition.authors.add(self.author) # readthrough @@ -160,6 +175,7 @@ class BookwyrmExportJob(TestCase): self.assertIsNotNone(self.job.export_json["books"]) self.assertEqual(len(self.job.export_json["books"]), 1) book = self.job.export_json["books"][0] + self.assertEqual(book["work"]["id"], self.work.remote_id) self.assertEqual(len(book["authors"]), 1) self.assertEqual(len(book["shelves"]), 1) @@ -169,6 +185,11 @@ class BookwyrmExportJob(TestCase): self.assertEqual(len(book["quotations"]), 1) self.assertEqual(len(book["readthroughs"]), 1) + self.assertEqual(book["edition"]["id"], self.edition.remote_id) + self.assertEqual( + book["edition"]["cover"]["url"], f"images/{self.edition.cover.name}" + ) + def test_start_export_task(self): """test saved list task saves initial json and data""" From d9bf848cfab311788fbe12392243776bbb07cff0 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Mon, 25 Mar 2024 18:25:43 +0100 Subject: [PATCH 158/200] Fix pylint warnings --- bookwyrm/models/bookwyrm_export_job.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 8e3927b73..c94c6bec0 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -236,7 +236,7 @@ class AddFileToTar(ChildJob): if settings.USE_S3: # Connection for writing temporary files - s3 = S3Boto3Storage() + storage = S3Boto3Storage() # Handle for creating the final archive s3_archive_path = f"exports/{export_task_id}.tar.gz" @@ -249,7 +249,7 @@ class AddFileToTar(ChildJob): # Save JSON file to a temporary location export_json_tmp_file = f"exports/{export_task_id}/archive.json" S3Boto3Storage.save( - s3, + storage, export_json_tmp_file, ContentFile(export_json_bytes), ) @@ -269,12 +269,12 @@ class AddFileToTar(ChildJob): export_job.save() # Delete temporary files - S3Boto3Storage.delete(s3, export_json_tmp_file) + S3Boto3Storage.delete(storage, export_json_tmp_file) else: export_job.export_data_file = f"{export_task_id}.tar.gz" - with export_job.export_data_file.open("wb") as f: - with BookwyrmTarFile.open(mode="w:gz", fileobj=f) as tar: + with export_job.export_data_file.open("wb") as tar_file: + with BookwyrmTarFile.open(mode="w:gz", fileobj=tar_file) as tar: # save json file tar.write_bytes(export_json_bytes) From 011e4a27a66be4b6e1203c5674f3036cf071c10a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 Mar 2024 16:13:00 -0700 Subject: [PATCH 159/200] Updates locales and adds missing trimmed on blocktrans --- bookwyrm/templates/413.html | 2 +- locale/ca_ES/LC_MESSAGES/django.mo | Bin 149032 -> 160564 bytes locale/ca_ES/LC_MESSAGES/django.po | 465 ++++++++++++++++----- locale/de_DE/LC_MESSAGES/django.mo | Bin 149930 -> 30883 bytes locale/de_DE/LC_MESSAGES/django.po | 458 ++++++++++++++++----- locale/en_US/LC_MESSAGES/django.po | 584 +++++++++++++++++--------- locale/eo_UY/LC_MESSAGES/django.mo | Bin 144089 -> 147953 bytes locale/eo_UY/LC_MESSAGES/django.po | 457 ++++++++++++++++----- locale/es_ES/LC_MESSAGES/django.mo | Bin 148786 -> 160115 bytes locale/es_ES/LC_MESSAGES/django.po | 485 ++++++++++++++++------ locale/eu_ES/LC_MESSAGES/django.mo | Bin 150037 -> 161391 bytes locale/eu_ES/LC_MESSAGES/django.po | 467 ++++++++++++++++----- locale/fi_FI/LC_MESSAGES/django.mo | Bin 143133 -> 144157 bytes locale/fi_FI/LC_MESSAGES/django.po | 432 ++++++++++++++++---- locale/fr_FR/LC_MESSAGES/django.mo | Bin 153012 -> 44850 bytes locale/fr_FR/LC_MESSAGES/django.po | 433 ++++++++++++++++---- locale/gl_ES/LC_MESSAGES/django.mo | Bin 145356 -> 156562 bytes locale/gl_ES/LC_MESSAGES/django.po | 460 ++++++++++++++++----- locale/it_IT/LC_MESSAGES/django.mo | Bin 145641 -> 159181 bytes locale/it_IT/LC_MESSAGES/django.po | 507 +++++++++++++++++------ locale/ko_KR/LC_MESSAGES/django.mo | Bin 55099 -> 59936 bytes locale/ko_KR/LC_MESSAGES/django.po | 6 +- locale/lt_LT/LC_MESSAGES/django.mo | Bin 145033 -> 144699 bytes locale/lt_LT/LC_MESSAGES/django.po | 415 +++++++++++++++---- locale/nl_NL/LC_MESSAGES/django.mo | Bin 147633 -> 151859 bytes locale/nl_NL/LC_MESSAGES/django.po | 449 +++++++++++++++----- locale/no_NO/LC_MESSAGES/django.mo | Bin 96055 -> 95977 bytes locale/no_NO/LC_MESSAGES/django.po | 427 +++++++++++++++---- locale/pl_PL/LC_MESSAGES/django.mo | Bin 130388 -> 138824 bytes locale/pl_PL/LC_MESSAGES/django.po | 533 +++++++++++++++++------- locale/pt_BR/LC_MESSAGES/django.mo | Bin 92307 -> 91988 bytes locale/pt_BR/LC_MESSAGES/django.po | 423 +++++++++++++++---- locale/pt_PT/LC_MESSAGES/django.mo | Bin 138784 -> 138441 bytes locale/pt_PT/LC_MESSAGES/django.po | 415 +++++++++++++++---- locale/ro_RO/LC_MESSAGES/django.mo | Bin 123365 -> 123024 bytes locale/ro_RO/LC_MESSAGES/django.po | 423 +++++++++++++++---- locale/sv_SE/LC_MESSAGES/django.mo | Bin 137804 -> 137881 bytes locale/sv_SE/LC_MESSAGES/django.po | 421 +++++++++++++++---- locale/uk_UA/LC_MESSAGES/django.mo | Bin 168423 -> 172148 bytes locale/uk_UA/LC_MESSAGES/django.po | 448 +++++++++++++++----- locale/zh_Hans/LC_MESSAGES/django.mo | Bin 94511 -> 44096 bytes locale/zh_Hans/LC_MESSAGES/django.po | 586 +++++++++++++++++++-------- locale/zh_Hant/LC_MESSAGES/django.mo | Bin 38001 -> 38839 bytes locale/zh_Hant/LC_MESSAGES/django.po | 531 +++++++++++++++++------- 44 files changed, 7567 insertions(+), 2260 deletions(-) diff --git a/bookwyrm/templates/413.html b/bookwyrm/templates/413.html index 337436aae..a849a764f 100644 --- a/bookwyrm/templates/413.html +++ b/bookwyrm/templates/413.html @@ -8,7 +8,7 @@

    {% trans "File too large" %}

    {% trans "The file you are uploading is too large." %}

    - {% blocktrans %} + {% blocktrans trimmed %} You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting. {% endblocktrans %}

    diff --git a/locale/ca_ES/LC_MESSAGES/django.mo b/locale/ca_ES/LC_MESSAGES/django.mo index ff27fe43358cc89955063433521227cd82b93e5d..4efccdb669f8302479aa98f93682808b7bb4b34f 100644 GIT binary patch delta 43026 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 delta 32312 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®uhiZ-0 zhwAtcs{S9=8>n`k+59hF0;(7(p*<|96-j{_X$Bk5j%u&~YG5T$FRTiv20Nf8G640a zn~r)Tu0;*_0BYs_vhk0o`rf38Ov6PmD+y&#OV&zganXW-KxEa;JF4O>yq4xGXYJfLUhbU?i^8(6- z8elW5id}Ii?#9AcEUD|9!#=2Z#bo9)V>sr}^S_ROmhPI(_!onT2PHQ%D2^IHRn$Nm zSes#G;-S_}*pK)p%!$2Hn5AEa4T&E>^^-iv_5XETUQ9^;&I1B^{61oBjFr;tT??#4 zybq4U{Wu&er*fV0cnW=(AhnsTEo-zOjBq4KzwdGoX0ZWT=kQ zpblFe)K5-jQCrXsHDPZ?o`1d5XOf_XR-yk?qh2t(ZTviHpx0659^3SPQHS*tYK5X@ zGAk4Zm7W;YPI}aUilPp26;wZcyacqAatn?@RVvdO~Fdnru;i#Fe!;H8cHGrF_L-o++N6Thr zo&a-^o(%h7CDd8jkD2f&s=b$}c0M3y#_M>pn}h_Yy$V9T^K+s)DsJN~P;azur~!^b zeV?C;n%Pd&iX26?bKa)kM?GEtqUuG;VYWOu`hWkIlYmZbIcrT+15HpP?TUI_`l421 z7V0eQL2cb}RLAFR{06GtebkwFZqr|*J|#b)wkT0f*BPznzXt)$>^)Aw*tyJJE<`P5 z{@iAU>rhL$3w4+dp$2df)zJ;qO58=hS~;&!6U&mv_5YNeA8QitjM|dD=p9Pn0ReT? zHm~`qMgjAE;1O;kUZSAue8K-v zujYRXnKxs}!mj_HdUh?$^WTGvJVjjpzerey<%oNVy8hpSS3u=YMeVhxn0e=?L4EGm z#nRXd_2%4;IWSsrlV1?^Dc1mpVt-Wmk2nB}mEif$M!;9XeD%7A+KPlF%@SwD48)6| zmaYW`<7TXk=TYyEl%>pfz&xn4(F}DaI-$0pkBtvUy@)1ZBi!sI5Jn(IX|v=*P!+GC z_VNMN!Plsjs8Gh_??lb`5NZNR%9<@Ii?xV%MLk9PQ3E)Gn%H&J%Kd{Hs5f3Y^PHwa z?NJ8QheR0ay)Xr{;#$-pyNqh^2I}xVMi0KiJop-0VTSVNu^Wr3H_y5Rb$C}IPl?y@ z5y(%%er$_xF+Dc@$$Tpwj@5~;MJ@S9EQ{qUxK1@3hl*c8J$5N7ngOOqJ@>gW7|Wto zw2h62VI+P2&mf?Rb5Ju{>d)X~61B9OunFF<@xql{XFBmvRK54u7~RU|@HN3^#K)uF zfKRXmzCyKMtBU!MYlQy4|DQ}i8UNXg&&nX4r>a@na8yTgF)uE|)_B>b7pZ1uS{8NM z>!aSB{qP@`rN?>1C)F_D0khOJhqfGgwbTu5!eGoyd>ZO>?!p3?u$K7-Qw2*C{}nZm zhZu&*YP(KPoQOBjsl%C}R&~&5P$GZXo^=SD<%c3)lZougkYIUo!u}Ib;lMPNLSX|KDoIXv60_5Bgrz z;d|cJb@pMccCPH7bIu|+S} zIYB&AZ`WCe|Kc=U)W=LTPhXecDf0a9CeV$HO8v}>W+(P09<{&eU^U_7?NSEv_J!;$6%vkld7!cpeM(+jodOHnVNn4?X4C)AmkgFSEq>ctj3 zhUdQsfvN<$;}}eb@39~w4H|16pSt7B=k`jhK>lSMj;Y4GPG?+#8d&TJ=CF3c>BI-4 zRwC|1*Z=<^S%h7P=bL0cRhLfU`7cPqF%tA4;Y>ECI5O%nOoCA`8%D(tn_mng6R(E) zFsW+yvBnVxEm}n9Lrip?xIitJPst{0wHt%a{lQrkEv6hOvp~ zL^W94#;e(Q6HH8cXH-WcFec7MeSukqdU5@ZdQm;{5>SKAR8t`iDxMbgLdk<_uo~(` z)CM)6L8wo&={9{ah7jL@n)x$SJ6};-8*7>w$Pm=PCZOIQ-h~A8qS=XR;1FsF-(y;I zrkjq_q0)<@8ZL_&u{LTz{ZRv&f?B}^sPey}ws;)|;C<8pA0sa;uk(?Bz81%rVMdk# z^(HK2?SX1w4eD$7UDOPmndaB=2~aPh8kibm&oW;`a-tsV7N`N8MGf?djXy{K@BjZJ zpuPNpIs>t0o8N#Y!5qYApq`QgsF{C8H5en@%s4)3ropKE%(xy4;!b>k|KOruT>f%` z7t|cnPv^O83GW}L4*{L_5vY&La8!fKP-kE*>iIp2n&Ax$#?Pojm2#dbUkr7q%Hbev ziYk8%HNlUlrH?+}tauRm|NUP90-8|?)Sj0|EpdBPg9A}#WTs7DgnAse*!XT#{nIvn z3ANOZQT4x~KAe&)Fy%6%(sM1~`Pbf8BtbK6g&N@y)X1lz2C@ko;X!PSDHoa*>xVaq zPeiR)$3^C_hM`t;JXXSmsQkyMm3W2zGql)iW|CmB$q2G$N1f(km0uFs$vdQxss?AsDv75Et}rP+7>jWMj#&n9g;7o0R(O|hbJ*=U_q!4pX`_%%b^-*j(W_xqdFLA^JiE$pw7l| z48$9#@^`FnHuC&y#L+gHg2AW`Lr_~$7FD4IX2f2o0nS4${d$|f4OQ>BjsJ-{Y|pJx zHk+p+4Qk*8Fb!7N%=4d_KnD^uv+1b4U5{Du2gR1z^=EvA#8cdG^NiU3A@@=TS z-j5pKDOCMSsDa-?t;j2DfH%T?xFklM+FI71Q7@oS)IfToKK&M=R$>q8E7(0$2W_{S z`rR-O@&2gvwWz0PD{6~RpeAw-b-2BE3FvS|+GaW|iW*2I)SlKsRcwVCc?ZCfH#H8iLxA z3aIj7s1BxKFs?%_{VCMaUq+pcXQ;>VolOte$(hjepNxP8kPUNVP3(xntj{nX@dmrh zr{qLbxmBpG`xCWAadw*lCPsCf6}9xGP+L(0wIc0sEA~eJ-~VUbV@8+X1xAJx&Wy-w)Q<^dqQ&Tt@Br9n==RxA{r;nf%PCvlW7wumY;RZm9ML?c@1Z#}i4= z$L36Ii>omhhA?=0B^kn z^rnlv-*lJ`)nGYP!G@>~TcDP*H>#sSs0K!%4&N-)8*dY8uTS7Kyoww9hg=%jj zs=oIS0X1+DwWKd`D1OAcIPiC~muFFXeh)RX$EdCQikflEgT|CtoOn)DN1ajcgJBqs zV^9-JeaK(m>x2-{5|u^`qzVqjwy27aP;a#7s18#fHm5oVD!&+NKxI%JHbk}81$7Af zq6f#L&d4OxW4Imz_5AN7pe5aBJ&OJ}7^=a`sHOkgrvHmAh`+~?*yxD)70WGDyxmdr zo7896hIrv)uG111Vi9zXn=i9PafzP)Sp?KU!4u|jD}mbk7S{HtmFbS!vkBIDn1%RS z)Icwx9^a>^7t?1fiYZQ-Gu8mrPA}AoO+jxa0?P^1z*DG|Nco3(Ofq6);vuLdn{3nP z;$`A1Q3D-v$~YQz7AB)QSY+edP>1sfYGAifhxFSio_{4IIc+KwK#i~}D!m=*=@@PE zm)ZQCHvb~(Q}H$G!zbPuV^-9Pltm4^A?i%DLH}n7YT(1pc+GP?js$(0Ek;#1h+3I5 zm!5Gv)cB0Dtfpzg7X23${%^7NjT7jXcj%T3;xB}JgF01z<0Ue?jsD_hX zFk6ug6)%mNXC0wGTcJ7*!}K@~f5#1Y5PMuPTb2K+d0!MoO`tMr zAU|VDJ^x(@^Cp8tQ%U5YON<)SmA7)A$GKv)~5mu)fFqnCP18|3~aq zP#uS32(CiC$ZlYep8ux=)IgN$rh#;*JuijzusP~eYa6QL-%)4bJZfbEZ7R!>)XP!d3r?X|@BAACRPhli{tb0VqTe)!GClStUL3XL5vVhB0yVJz zPy=&s8RJ>gpk|r}wSpzF8XJkeifMww8Dv7EIU zW*}Z4HGn~w11F-+)GpN0pGB3sgZ`DiZQ4(F+iL>FNzl?Xz{2Q7jeIBSa2>^r_{_!= z+%fS&7)*L|)Z;r8^+KA1+5#VHD=(t9?6oz+T{GbZUIJRmFx1HAV?o@38u=?sjqW{@ zp9VG4;;4GnFf;Z=ZN*~LMAlm`q4xR<>I}rZZ{7=uQD?)Ojez#11nNVm9BSrOuroHo zPIv^>LEZ=E@hpitD;2O1*2W?@0agD9j>n7G1)D!K?VqwY@%8-QB%r-| zg_>ckC#Ip~s4Yl~>No_o z&wm~Q*|8C7WTR1Uz^SMXez9&u4fF`=kljPQXxzWeAufno`dX-`q&cd+_SP`emJLEZ z?qkraQ@ehjAq8aIdrJ z$4~>g`HbgZfyX4M!PgjoUu@icZeA2IP)imU)lg#eA4XKYlBj`KLbX>D{R2X6O>5Ly z>4{Zww2fbQ&hxK~ha{-N2h?G5Uzk^GA}m4tXVi@5qRzxd)E4Zw`L|GyZOWIX!+NOl zp{Vi$P+Ky=rq8tT)m{SHf-RUEPoie@88x8DuS`5P)+e46wG!P>hpM;DA7kUwP;b6v zsE&7{CUnBaZ&_cWR>rHpA=c8xMU5~C>Uj>vY}m-gN1+bsJ`BdcQHL|;zvc@^I@FBI zV_s}*Y~auL(RM$ z>eW01wbTnyOT7{G>2?t7;4#!w5%kuypBbwVFM|I6|KDhvF#+}bEBvVs25LW8!z>d=U+3cMS?zNJE9Kb z6x5f@*{G%4iJI|YRL9p)9o$9jG=dH%I$ zbw0aJDQt(@f>o#vw%hn|)Bvv7^k=9Q`G%TN@-OD+guJMyrxj{o^H2j`j+1abYDJ2E zHD{=rmq0KHZBR=)3N?V4m=BktDqOMoPf#oN9y4RSZ{|a(2X1%B)n9>n zGw!hI2T?2Qy++_?0uND3UWOl*LopPq;YrMd$y|^B!=^OqJ3VQ<#7{u7f(geNZzPfvPYKwUozD)oL7k!00mh7|0p>upR|56e)aQJ^(C7ak0_tEl>W%gXYL6eH_VgQuU{EAGa@48r zj%9EbYK5+1ZoG?{X@bZe{|hSvDxT9?3boR;(f|9u<^**3+Tt+mjauq=sEW~}nEW7X zHfs^oKr5k6c`MXFI-*vl7iuMkTc@KQzon>G`LQS-^Z);QN`e|l6V>DY)k+p@PkcO< z!q@l`^F{OcU!Ccro5R>0vyr|6^>KV2bKxt@g26G&)>KB#xD{%Px>3{~b?DREJMdGYm** zCXfU5Lh6U3a0cp3B}-(sE-UI#7DlafDb&__D-zI>G)8^3YGE@5AwPRKlTmND9!Wg@ zPqlGak@#e6hF4H~T_CBcUk>$+sRin*+#=Mc;WCVht57eV&B)pCI(tpPIc2?xD)<~V zptq`gX9lA@XGx5Nt2k>8@)Qpp$29O2)fB%=CfR?lr zYNU<)8GJmV9>)%-4o9FK$5mJW52Fs%XHm$Ekjm^?57b`vLp_$`tn*Pb-iWGy5H*koHvR_HVUpBl0vS;Q zu7Y{6A$qlU;|b_c{DMVrG4{agsI90LY#y`vs0N3l(x;(jIv4$WidwO~s55f~v*AnB z%B4tS23iRHPfZ%0|8!*ZBtfslaO*nMUL8OU@B(V)cWnNDsF_DgYdT7ant6WI0L!CZ z<#ka5?T8vcPt*%&Dr&&n(|XO4{B8@Lu^CrUOLgC-|AU(8N7Q2$FP+E#ui&!dO5#&d z11gl>ZqACKy5`k)ZQ<}+!%pv z@jhzLt7P){|AS*)upjZesCqwV_W1t}X*R~>F?O?MsraQ)`figMG3#lIe2rwVz*5Ylvjid2EZjUnrE9NmTvZGj! zc!Inh|Bv?_P<#FYLoiB+e?t8CKM52jp)*#%6_`~8Q8P@I&pgLPQBO-FEQ)`kmN-#< zvodQ@1G|Ab1Mv!&Jq|{_DYIiEtdBYao3M&nyi7nZinImI5|u(7y1uBTABAdgHtJ9= z#~kRxF8BbuW1T{#gF~o#sS2Azm8!@JlMQx`Rd zW(Mj^EJi&gn@}&L!>CjK6!i*sikVk)WK?<$Ybff4H4t^ywxAC8F7)a#I7&e8>ICils25B+q{> z0=-Il{C~lC1U16wrOaW8kD5s~OpT>cOWP9l-UvfIHM3C@S!CmDQ8V0%+NuNC3}0ey ztX|sV{|^~^OY{6|Pt%t%1qxsZ;cppHMNm+Yp}Y zA(1PU!TE)FEb?C1ct)$BxRa8+O_b4#tQ`sbu7l@axm+Do;)m-u3hP=$g%yNX`%joj z%ShSQR4$EY$iGGSG~uSU%rV>6eCqWgEjRh~xeJrNl_q8r9&g&$`R7M$68e#O*;eFN z0siX*z9emiZFm@+=?WyilW?FN7+N?J*oNd(Fg=Be{vdi4J9qW`M4@$?j2 zNdtXsK@}QJ_yq1kod;bVxphdVQE#}dtMn{3+=h0t&`wR_D@iX;n9nPH<#Se(_m;F7 zgmpdR{5fkWn1c*mrE$LvM`z}TY{7&y@(1_#YbSx)w!<#Ayz=`G$=erWtXWlq@vrNC6=wXh9$qm8-5J5eT| z9q6C55kR;iWxA7>2}f|Jq|6@j4(a=!t|i=U$tZ^@P}gtVe5N={xcOz6{|%}1s``Vg zDGhEUU7zcV3G4cTQAmr-J(+tZbz9o@))KD8-G+M|cMO$_ME`mo(^2TNzls0*BiJ_D zn1WHLkc9XI%t>6=3E~xqd$^wx*SBR|)i5^g9VOfht6(IX$7hrO?~wE|O2+MLz6+Nw-=wFX5z2Jr)gn<$T4 z*H`L%BkcxZZz=vLMnVTNv(e}ZTZm+*CGl6})g^5R4b39loAei?AGYQ4kp7m&268Va z{Qc6)Y$fH&;Aisk5$;a@Si;}05PtvUWT4R>uiO+&PND3i>nqidS56{HY$u_FFLAG@ z>~sdhZ&sXhw(&vK)pvw+q&>s;+%L)NX9rExX+oK3`u$ryGRlyV_=nLiR|$K~r=Wh& z=tBNx$|kXmY$x2F!G@6k4>m_#7syXV-WJ08k?Z?ag#5>pTW9OnAneRo-Y$;!3Z;*d z%dgx0mzVGravzbtk#Jj;4QlBm3U>^ zD5nA0PEL~c{n|pg^>&~;NWWmi%3mG89+V=X5O+HoSYtC!*#RU}qg<_iXs|Ewi{u|8 zZ5!o35x&5km~eGlFOse2ugo9wxtoyo1qU$5tlW#KUy=U(*RQrhVlrZLzoD^a+=IDw zZL$q3%r6+6#>88YH=nYtFdnw$ZcKO*`I&6J1eBY_U6XoS(MO)HW|Y0{2u3&LpEZY5WGN;o0wQ@S(1hqEDju|r6~HT`Wh4JGg&Pz0ali6c zB*68WGJg|KOqpsnJrn6yiR=2C{Mk0W6Mgu&S2Bpw+{H+r;I)|xZKvgk=OuFv@wOUc@9|D_U7t(aKB7LY0drR7e_mMDy z%o)W0;@-uboq^~YK)9x@p!jhbXh7QcYasDoiR;_vcXNsX zI$U1<3q(A6g!n61r#|5T?sxt?Ug{K1Nn>5PXOT9R_;V`u#QZn`bJ{`Hp?(bNM&@2c z+3Y_IxGd!g*!W_~KOoGvYp1@R{{}Qvk~%b ziRUG6BzHy9bp3(nxEql+*w%|fxj2Md;d+}^mVuo8{`{+Ake!Lbx;D^3J<^uY*f8$X zq^%>K1~+l{r=bWMyiVR2?#kS{ijg*(y1(Q1>n8E(+*zs9n{rEShBpBXR<$F#N@5K% z-w@ACx_++ue%-WqKLefK^XHmBs=*$82h+vRTo(m;7`mv|_7xha#LaB%Cei!t=SAF7- zNS{i|Wy(FoYLu;jQ*o1RH%}ERg^_rG3Y93hg$(|}!GATk_Mk!(TVdCXCG8S;*Qj~Q zRJSE=P_quDzF&oH_&;jtcN7tnyURU@a=OOhGU7c<)Y(S-Ew_jAV`;l4{zP7wZRfhJ zmyXla7}zxq!~qvg1tbH}6bI~qz#{xa0{3-!L4ApZ?IKJ+O!fP0}$ z`=NUic_%{>HOOW z=Q$OY5f7ovX5xtm4^STQ>V&J1c872|PJYDmx^$FLe-uLS~?VhEq|EV2L zAQ5*>8aRbTDEJ!&68B%WVoA~}*ajOA*7cFROx($c=dx*+zSkqaG~x8N&S=V&P#SkWKH49c{QZ4Nj*{YVI1`?}+E3t@-4y z#pJZzk8o|my7u5+?hKU6X6Db=44YY$P8Lx(HO8c3K?-#tzK@DGC^LYxIowA`Z-a#~ z9yX=S@8mDXw*GE-*^^g@JQthOUIo+DLM2WWz`3;3DBt zG**y?zh5aSznwNlk>1NTJdd({x%E5i(>5&{@ehR4p{`Hd{{2^E367&W566J=<_^3jf4_7Sf=ue%y8Jz@poRuK7q4I>_(yFQ&&q=Ozm;qTWN0u8taQuiPH%VxBtTqn{Zs5{&aZYtqH`n#CBB>YPw$+&0H@lI~a zI+rN$n7sS8!g>;mkv^7t8hNQHUz)N_xwBDb1Wv)+s?60B?~^u~@V}(bApGO?l(Yl- zsX^D;|Cc$34kmN+cPP$W<=IC6Bds&xSEPR>{R#1Uv39dHfd(*>-=U{A=!` z+zo7bl`Zcjf&V$bQaCFO^s$X7^Mnn@QiLlG1*54jR~7OSVK?GS=_JCR%Aq8Ef$g*p z9qIGs`?Y|wB}toL^CwZ(n~H>EB)q27FC>&F{t$6g)x0c?c&XzXp|J(pV+6$TgSv zKa{D9*YJ%=_W$`a^wwl~YYMZ-*?enCb|9(FVAPNn3;0~qG04f~& zo<{>;xOFAOoHU${yxk_r`9fS*3F>Yp{cpmBzSs5V@PogtujqT)?@fMp?Z2)r+*xcR zB}r>R0bMgO7V$CIlDof6e`2jfBehIX|DVf==VA~GF(dVE;A`&h*HF?9Q8x>QknSBt z;ilw%B;nfkQW(sgjJ#VmZ3_A07~o7h$m(_gQEhx0`MRcY2hs37@^ess5_eSM4Q+mH zTTf;G)BgL&EUJdF0fo|X7bl*U0&588B0VaN1aRLWEu6foq#fmML}Mc;bDwZt(pOPt zF7ZZ$A8_j`$=#E3Q^?E8{n@4~Z{qjoUy*xMyiLJzsA~xBx8a_2psi|11K+Q8-vhXW z^fNS^kGl$GyAh8;IIAs_f_7hUx1fz>u6yN3i_p;TH#VlfKkv7^jkeNUOz zgj3kE)d{z^gZqQDtJE7zJf#}ty3HNO4mP?~>FI5qKW#a0avJKY9Im7`@jBraH2O2~ z1>}eObNN`Np^4l_Z8;^kC%+=`s`<OMC?J1tjFRWh>c^8`5qR?px%))cku>tF7CqP+)HWWGHvu`Ajhez>p1y) zNiRxT9OAza9*Jj3FJQ}b)%$rZiJwTQK|{J0aaSc?7dw$(*%t0YSeM5dPI>^1EyPUR z8%?&;owV=QL;@dl)Am{FjU=xQjwQaBbZ-a#n8e+V1_qN@h0zY7z+wuvCcQ85X@nzl zKe8RCA$)~f*C6h+r2j>IT_ZJH@>1h0($bk^XCiIiAbykhHLOfN7yoz84(;6RGkSSP zMJyPaAn%NWTk}Me-!>@0jMK;R26k`RE;J(O_$xP2**f)u%lGTvEv%QLV5mPhBk9R` z5&KWpjuesU-0r}LkC#TfGtORl7_s~6B2UDM>jOLy`EUIiIKy)i0q(Pa@GVi?o4(mm-N&x)c62w3 z>l+c%Jr)?=A)Y(k7d^h4A<)+%u^Zy?ElTR1^7yW&aF2U@>r%Px-SA|=?gwA@G;S`B zZ(}-lM1Ze&Cbz4{cQK3G%oBb%yBp*S$>C1*`0nR&uLk(uhPcV1_^uaqwEHuV-jjaGTIxEjx7X89uGJo7;D$xH~tJuSYqzTO?oQ%5JO3zD%{;Pp9>W2SS-%T5yw}G3~_ql;P#0{U{$gLCEEK+!*25wv5lSXck8$Re~w{ql`t$TIo z6FR$zn{j&+_gsMQN^>`Jr10QScSY3Pd4qF@6v>mvcRJLq#6N#tQi`{IibDa&Y61m z?Am44egD1U@Kkfwh{_E^H M94Y*In5WVI09CtzD*ylh diff --git a/locale/ca_ES/LC_MESSAGES/django.po b/locale/ca_ES/LC_MESSAGES/django.po index f73aa49bf..b40a248bf 100644 --- a/locale/ca_ES/LC_MESSAGES/django.po +++ b/locale/ca_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:11\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-14 20:35\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -54,19 +54,19 @@ msgstr "La contrasenya no coincideix" msgid "Incorrect Password" msgstr "La contrasenya no Ês correcta" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "La data de finalitzaciÃŗ de lectura no pot ser anterior a la d'inici." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "La data d'aturada de lectura no pot ser anterior a la d'inici." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "La data d'aturada de la lectura no pot ser en el futur." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "La data de finalitzaciÃŗ de la lectura no pot ser en el futur." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Informe generat automàticament" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Pendent" @@ -258,17 +259,24 @@ msgstr "Seguidors" msgid "Private" msgstr "Privat" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Actiu" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Complet" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Aturat" @@ -284,6 +292,10 @@ msgstr "Error en carregar el llibre" msgid "Could not find a match for book" msgstr "No s'ha trobat el llibre" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Ha fallat" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Lliure" @@ -359,7 +371,7 @@ msgstr "Ressenya" msgid "Comments" msgstr "Comentaris" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citacions" @@ -461,7 +473,7 @@ msgstr "Svenska (suec)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ucraïnès)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (xinès tradicional)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Vaja!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Permís denegat" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "No tens permís per veure aquesta pàgina ni per dur a terme aquesta acciÃŗ. El vostre nivell de permís d'usuari Ês %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Si creieu que hauríeu de tenir accÊs, parleu amb l'administrador del vostre servidor BookWyrm." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,19 @@ msgstr "La pàgina que heu sol¡licitat no existeix" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "El fitxer Ês massa gran" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "El fitxer que estàs carregant Ês massa gran." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +"Podeu provar d'utilitzar un fitxer mÊs petit o demanar al vostre administrador del servidor BookWyrm que augmenti la configuraciÃŗ de DATA_UPLOAD_MAX_MEMORY_SIZE.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +978,7 @@ msgstr "Desa" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +996,7 @@ msgstr "La càrrega de les dades es connectarà a %(source_name)sLists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Utilitzeu els enllaços Llistes, Descobriu i Els vostres llibres per descobrir suggeriments de lectura i els darrers esdeveniments en aquest servidor, o per veure els vostres llibres catalogats!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,7 +2599,7 @@ msgstr "Notificacions" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Es pot accedir al vostre perfil, directori d'usuaris, missatges directes i configuraciÃŗ fent clic al vostre nom al menÃē aquí." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2826,111 +2846,121 @@ msgid "No activities for this hashtag yet!" msgstr "Cap activitat per a aquesta etiqueta!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importa Llibres" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Importa la llista de llibres" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Fitxer CSV no vàlid" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Actualment se us permet la importaciÃŗ de %(display_size)s llibres cada %(import_limit_reset)s dia." msgstr[1] "Actualment se us permet la importaciÃŗ de %(display_size)s llibres cada %(import_limit_reset)s dies." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "Et queden %(display_left)s llibres per importar." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Les importacions recents han durat %(hours)s de mitjana." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Les importacions recents han durat %(minutes)s de mitjana." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Font de la informaciÃŗ:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Podeu descarregar-vos les vostres dades de Goodreads des de la pàgina d'Importa/Exporta del vostre compte de Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Arxiu de dades:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Inclou ressenyes" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "ConfiguraciÃŗ de privacitat per les ressenyes importades:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importa" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Has arribat al límit d'importacions." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Les importacions es troben temporalment deshabilitades; gràcies per la vostra paciència." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Importacions recents" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Data de creaciÃŗ" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Darrera actualitzaciÃŗ" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Items" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "No hi ha cap importaciÃŗ recent" @@ -2966,7 +2996,8 @@ msgid "Refresh" msgstr "Refresca" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Atura la importaciÃŗ" @@ -3064,6 +3095,133 @@ msgstr "Aquesta importaciÃŗ està en un format antic que ja no es mantÊ. Si vol msgid "Update import" msgstr "Actualitza la importaciÃŗ" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Importa el compte de BookWyrm" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "No Ês un fitxer d'importaciÃŗ vàlid" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "Si voleu migrar qualsevol estat (comentaris, ressenyes o cites), heu de definir aquest compte com a àlies del que esteu migrant o bÊ moure aquest compte. a aquest, abans d'importar les dades d'usuari." + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "Actualment podeu importar un usuari cada %(user_import_hours)s hores." + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "A continuaciÃŗ, podreu importar un fitxer d'usuari a %(next_available)s" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Pas 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "Seleccioneu un fitxer d'exportaciÃŗ generat des d'un altre compte de BookWyrm. El format del fitxer hauria de ser .tar.gz." + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Pas 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "Desmarqueu les caselles de selecciÃŗ de les dades que no vulgueu incloure a la vostra importaciÃŗ." + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Perfil d'usuari" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "Sobreescriu el nom de visualitzaciÃŗ, el resum i l'avatar" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "ConfiguraciÃŗ de l'usuari" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "Sobreescriu:" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "Si cal l'aprovaciÃŗ manual perquè altres usuaris segueixin el vostre compte" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "Si es mostren els seguidors/seguidors al teu perfil" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "Si el vostre objectiu de lectura es mostra al vostre perfil" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "Tant si veieu que l'usuari segueix els suggeriments" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "Si el teu compte Ês suggerit a altres persones" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "La teva zona horària" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "La vostra configuraciÃŗ de privadesa de publicaciÃŗ predeterminada" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "Seguidors i seguidors" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Usuaris bloquejats" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "Objectius de lectura" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "Sobreescriu els objectius de lectura per a tots els anys que figuren al fitxer d'importaciÃŗ" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Prestatges" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "Historial de lectura" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "Ressenyes de llibres" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Comentaris sobre llibres" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Llistes de llibres" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Llistes desades" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3242,7 @@ msgid "Reject" msgstr "Rebutja" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Elements fallits" @@ -3747,8 +3905,8 @@ msgstr "%(related_user)s us ha convidat a #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nova sol¡licitud d'invitaciÃŗ esperant resposta" +msgstr[1] "%(display_count)s noves sol¡licituds d'invitaciÃŗ en espera de resposta" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4022,16 @@ msgstr "ha canviat el nom de %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "ha canviat la descripciÃŗ de %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "La vostra exportaciÃŗ d'usuari està a punt." + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "La vostra importaciÃŗ d'usuari s'ha completat." + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Elimina les notificacions" @@ -4107,7 +4275,7 @@ msgstr "Esborra l'àlies" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Usuaris bloquejats" @@ -4242,14 +4410,66 @@ msgstr "Privacitat de publicaciÃŗ per defecte:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Cerques prestatges privats? Pots modificar els nivells de visibilitat dels teus prestatges. Ves a Els teus llibres, tria un prestatge de la barra de pestanyes i prem \"edita prestatge.\"" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "Exporta el compte de BookWyrm" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "Podeu crear un fitxer d'exportaciÃŗ aquí. AixÃ˛ us permetrà migrar les vostres dades a un altre compte de BookWyrm." + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "

    El vostre fitxer inclourà:

    • Perfil d'usuari
    • La majoria de la configuraciÃŗ de l'usuari
    • Objectius de lectura
    • Prestatges
    • Historial de lectura
    • Ressenyes de llibres
    • Estats
    • Les vostres prÃ˛pies llistes i llistes desades
    • Quins usuaris seguiu i bloquegeu

    El vostre fitxer no inclourà:

    • Missatges directes
    • Respostes als vostres estats
    • Grups
    • Preferits< /li>
    " + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "Al teu nou compte BookWyrm pots triar què importar: no hauràs d'importar tot el que s'exporti." + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "Si voleu migrar qualsevol estat (comentaris, ressenyes o cites), heu de definir el compte al qual us moveu com a àlies d'aquest, o bÊ moure aquest compte. al compte nou, abans d'importar les dades d'usuari." + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "Podreu crear un fitxer d'exportaciÃŗ nou a %(next_available)s" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "Creeu un fitxer d'exportaciÃŗ d'usuari" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Exportacions recents" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "Els fitxers d'exportaciÃŗ de l'usuari es mostraran \"complets\" un cop estiguin preparats. AixÃ˛ pot trigar una mica. Feu clic a l'enllaç per descarregar el vostre fitxer." + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Data" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "Mida" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "Descarrega la teva exportaciÃŗ" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "ExportaciÃŗ CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "Exporta la llista de llibres" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "La vostra exportaciÃŗ inclourà tots els llibres dels vostres prestatges, llibres que heu ressenyat i llibres amb activitat de lectura." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "El vostre fitxer d'exportaciÃŗ CSV inclourà tots els llibres dels vostres prestatges, els llibres que hàgiu revisat i els llibres amb activitat de lectura.
    Feu servir aixÃ˛ per importar a un servei com Goodreads." #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4487,7 @@ msgstr "Moure al compte" msgid "Data" msgstr "Dades" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "ExportaciÃŗ CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relacions" @@ -4763,7 +4979,8 @@ msgid "Active Tasks" msgstr "Tasques actives" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5157,9 +5374,14 @@ msgid "No instances found" msgstr "No s'ha trobat cap instància" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Atura la importaciÃŗ?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "Aquesta acciÃŗ aturarà la importaciÃŗ de l'usuari abans que es completi i no es pot desfer" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Deshabilita iniciar noves importacions" @@ -5172,70 +5394,107 @@ msgstr "Aquesta acciÃŗ nomÊs està indicada pe a quan les coses han anat molt m msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Mentre les importacions es troben deshabilitades, els usuaris no podran iniciar noves importacions, perÃ˛ les que es troben en curs no es veuran afectades." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "Aquesta configuraciÃŗ impedeix tant les importacions de llibres com les d'usuaris." + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Deshabilitar les importacions" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Els usuaris no poden iniciar noves importacions actualment" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Habilitar les importacions" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Limita la quantitat d'importacions" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Alguns usuaris poden intentar importar una gran quantitat de llibres, cosa que podries voler limitar." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Estableix el valor a 0 per tal de no especificar cap limitaciÃŗ." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Estableix el límit d'importacions en" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "llibres cada" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "dies." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Estableix el límit" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "Limiteu la freqÃŧència amb què els usuaris poden importar i exportar" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "Alguns usuaris poden intentar executar importacions o exportacions d'usuaris amb molta freqÃŧència, cosa que voleu limitar." + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "Restringeix les importacions i exportacions dels usuaris a una vegada cada " + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "hores" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "Canvia el límit" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "ImportaciÃŗ de llibres" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Completat" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Usuari" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Data actualitzaciÃŗ" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Elements pendents" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Ítems amb èxit" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "No s'han trobat importacions coincidents." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "ImportaciÃŗ d'usuaris" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5722,7 +5981,7 @@ msgstr "Estableix el tema per defecte de la instància" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Sembla que un dels vostres temes està trencat. Si seleccioneu aquest tema, l'aplicaciÃŗ no es podrà utilitzar." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5776,15 +6035,15 @@ msgstr "Elimina el tema" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Prova aquest tema" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Tema trencat" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "S'ha carregat amb èxit" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5833,7 +6092,7 @@ msgstr "No s'ha configurat" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Aquest compte Ês l'actor de la instància per signar sol¡licituds HTTP." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5905,15 +6164,15 @@ msgstr "Accions d'usuari" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Aquest Ês l'actor administrador de la instància" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "No heu de suprimir ni desactivar aquest compte, ja que Ês fonamental per al funcionament del vostre servidor. Aquest actor signa sol¡licituds GET sortints per facilitar la interacciÃŗ amb els servidors d'ActivityPub segurs." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Els usuaris normals no poden descobrir aquest compte i no tÊ una pàgina de perfil." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6048,17 +6307,15 @@ msgstr "Crea un prestatge" msgid "Edit Shelf" msgstr "Edita el prestatge" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Perfil d'usuari" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Tots els llibres" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importa Llibres" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6412,7 +6669,7 @@ msgstr "Seguiu al compte nou" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s s'ha mogut a %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index 57ec9f361d52e047f1f0a2fa25d36fb1bb0ed8e2..4ce83f72b3f3850c58528f13afcd23442a75a515 100644 GIT binary patch literal 30883 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�CGK<(i`HJk;u>h}7zsZ}K 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

    *2S!IfeBEXiaA*$JHK^yF8PGe?_L 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 WpQ~N}<=T`|=sUhLbH2BCb@Ct3jj$2` diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index c88645d94..a2f088210 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-16 02:19\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -54,19 +54,19 @@ msgstr "Passwort stimmt nicht Ãŧberein" msgid "Incorrect Password" msgstr "Falsches Passwort" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Enddatum darf nicht vor dem Startdatum liegen." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Das Datum fÃŧr \"Lesen gestoppt\" kann nicht vor dem Lesestart sein." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Das Datum fÃŧr \"Lesen gestoppt\" kann nicht in der Zukunft sein." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Das Datum \"Lesen beendet\" kann nicht in der Zukunft liegen." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Automatisch generierter Bericht" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Ausstehend" @@ -258,17 +259,24 @@ msgstr "Follower*innen" msgid "Private" msgstr "Privat" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktiv" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Abgeschlossen" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Gestoppt" @@ -284,6 +292,10 @@ msgstr "Fehler beim Laden des Buches" msgid "Could not find a match for book" msgstr "Keine Übereinstimmung fÃŧr das Buch gefunden" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Fehlgeschlagen" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Kostenlos" @@ -359,7 +371,7 @@ msgstr "Rezensionen" msgid "Comments" msgstr "Kommentare" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Zitate" @@ -461,7 +473,7 @@ msgstr "Svenska (Schwedisch)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainisch)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (Chinesisch, traditionell)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Oh nein!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Zugiff verweigert" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Du hast keine Berechtigung, diese Seite zu sehen oder diese Aktion durchzufÃŧhren. Deine Berechtigungsstufe ist %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Wenn du glaubst, dass du Zugang haben solltest, wende dich bitte an deine(n) BookWyrm-Server-Administrator*in." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,18 @@ msgstr "Die Seite, die du angefordert hast, scheint nicht zu existieren!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Datei zu groß" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Die Datei, die du hochladen willst, ist zu groß." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr " Du kannst es mit einer kleineren Datei probieren oder deine(n) BookWyrm-Server-Administrator*in bitten, den Wert der Einstellung DATA_UPLOAD_MAX_MEMORY_SIZE zu erhÃļhen.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +977,7 @@ msgstr "Speichern" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +995,7 @@ msgstr "Das Laden von Daten wird eine Verbindung zu %(source_name)sLists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Verwende die Links Listen, Entdecke, und Deine BÃŧcher um Lesevorschläge, die neuesten Ereignisse auf diesem Server oder katalogisierte BÃŧcher einzusehen!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,7 +2598,7 @@ msgstr "Benachrichtigungen" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Dein Profil, dein Verzeichnis, deine Direktnachrichten und deine Einstellungen kÃļnnen durch das Klicken auf deinen Namen hier im MenÃŧ aufgerufen werden." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2826,111 +2845,121 @@ msgid "No activities for this hashtag yet!" msgstr "Keine Aktivitäten fÃŧr diesen Hashtag bisher!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "BÃŧcher importieren" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "BÃŧcherliste importieren" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Keine gÃŧltige CSV-Datei" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Aktuell dÃŧrfen Sie %(display_size)s BÃŧcher, alle %(import_limit_reset)s Tage importieren." msgstr[1] "Zurzeit dÃŧrfen Sie alle %(import_limit_reset)s Tage bis zu %(display_size)s BÃŧcher importieren." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "Du hast noch %(display_left)s Ãŧbrig." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Im Durchschnitt haben die letzten Importe %(hours)s Stunden in Anspruch genommen." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Im Durchschnitt haben die letzten Importe %(minutes)s Minuten in Anspruch genommen." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Datenquelle:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Du kannst deine Goodreads-Daten von der Import / Export-Seite deines Goodreads-Kontos downloaden." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Datei:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Besprechungen einschließen" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Datenschutzeinstellung fÃŧr importierte Besprechungen:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importieren" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Sie haben das Importlimit erreicht." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importe sind vorÃŧbergehend deaktiviert; vielen Dank fÃŧr deine Geduld." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Zuletzt importiert" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Erstellungsdatum" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Zuletzt aktualisiert" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Einträge" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Keine aktuellen Importe" @@ -2966,7 +2995,8 @@ msgid "Refresh" msgstr "Aktualisieren" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Import stoppen" @@ -3064,6 +3094,133 @@ msgstr "Dieser Import ist in einem alten Format, das nicht mehr unterstÃŧtzt wir msgid "Update import" msgstr "Import aktualisieren" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "BookWyrm-Konto importieren" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "Keine gÃŧltige Importdatei" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "Wenn du etwaige Status (Kommentare, Rezensionen oder Zitate) migrieren mÃļchtest, musst du entweder diesen Account als einen Alias desjenigen setzen, von dem du migrierst oder ihn zu diesem umziehen, bevor du deine Benutzerdaten importierst." + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "Derzeit darfst Du alle %(user_import_hours)s Stunden einen Account importieren." + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "Zum Zeitpunkt %(next_available)s kannst Du erneut einen Account aus einer Exportdatei importieren" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Schritt 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "Wähle einen Dateiexport eines anderen BookWyrm-Accounts aus. Das Dateiformat sollte .tar.gz sein." + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Schritt 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "Wähle die Checkboxen ab fÃŧr Daten, die Du nicht importieren mÃļchtest." + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Profil" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "Überschreibe Anzeigename, Zusammenfassung und Profilbild" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Benutzereinstellungen" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "Überschreibt:" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "Ob eine manuelle Freigabe fÃŧr Benutzer*innen erforderlich ist, die dir folgen wollen" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "Ob deine Folgenden und Gefolgte auf deinem Profil angezeigt werden" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "Ob dein Leseziel in deinem Profil angezeigt wird" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "Ob dir Benutzer*innen zum Folgen vorgeschlagen werden" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "Ob dein Account anderen vorgeschlagen wird" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Deine Zeitzone" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "Deine Standardeinstellung fÃŧr Beitragssichtbarkeit" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "Folgende und Gefolgte" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Blockierte Accounts" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "Leseziel" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "Überschreibe die Leseziele aller in der Import-Datei vorhanden Jahre" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Regale" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "Leseverlauf" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "Rezensionen" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Kommentare zu BÃŧchern" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Buchlisten" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Gespeicherte Listen" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3241,7 @@ msgid "Reject" msgstr "Ablehnen" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Fehlgeschlagene Elemente" @@ -3747,8 +3904,8 @@ msgstr "%(related_user)s hat dich eingelad #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Neue Einladungsanfrage wartet auf Antwort" +msgstr[1] "%(display_count)s neue Einladungsanfragen warten auf Antwort" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4021,16 @@ msgstr "hat den Namen von %(group_name)s geänder msgid "has changed the description of %(group_name)s" msgstr "hat die Beschreibung von %(group_name)s geändert" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "Dein Export des Accounts ist bereit." + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "Der Import deines Accounts ist abgeschlossen." + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Benachrichtigungen lÃļschen" @@ -4107,7 +4274,7 @@ msgstr "Alias entfernen" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Gesperrte Benutzer*innen" @@ -4242,14 +4409,66 @@ msgstr "Voreinstellung fÃŧr Beitragssichtbarkeit:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Auf der Suche nach der Privatsphäre des Regals? Du kannst fÃŧr jedes deiner Regale ein separates Sichtbarkeitsniveau festlegen. Gehe zu Deine BÃŧcher, wähle ein Regal aus der Registerleiste und klicke auf \"Regal bearbeiten\"" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "BookWyrm-Konto exportieren" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "Hier kannst du eine Export-Datei erstellen. So kannst du deine Daten zu einem anderen BookWyrm-Account migrieren." + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "

    Deine Datei wird enthalten:

    • Profil
    • Die meisten Benutzereinstellungen
    • Leseziele
    • Regale
    • Leseverlauf
    • Rezensionen
    • Die Status
    • Eigene und gespeicherte Listen
    • Gefolgte und geblockte Benutzer*innen

    Deine Datei wird nicht enthalten:

    • Direktnachrichten
    • Antworten auf deine Status
    • Gruppen
    • Favoriten
    " + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "In deinem neuen BookWyrm-Account kannst du entscheiden, was du importieren mÃļchtest: Du musst nicht alles importieren, was exportiert wurde." + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "Wenn du etwaige Status (Kommentare, Rezensionen oder Zitate) migrieren mÃļchtest, musst du entweder den Account, zu dem du migrierst, als einen Alias dieses Accounts setzen, oder diesen Account zu dem Account umziehen, bevor du deine Benutzerdaten importierst." + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "Zum Zeitpunkt %(next_available)s kannst du erneut eine Export-Datei erstellen" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "Account-Exportdatei erstellen" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Zuletzt exportiert" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "Die Datei mit dem exportierten Account wird als 'complete' angezeigt, sobald sie fertig ist. Das kenn einige Zeit dauern. Klicke auf den Link, um sie herunterzuladen." + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Zeitpunkt" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "GrÃļße" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "Export herunterladen" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSV-Export" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "BÃŧcherliste exportieren" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Dein Export enthält alle BÃŧcher in deinen Regalen, BÃŧcher, die du bewertet hast und BÃŧcher mit Leseaktivität." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "Die exportierte CSV-Datei wird alle BÃŧcher aus deinen Regalen, die du rezensiert hast und die du gerade liest, enthalten.
    Nutze sie, um deine Daten in andere Services wie Goodreads zu importieren." #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4486,7 @@ msgstr "Account umziehen" msgid "Data" msgstr "Daten" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV-Export" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Beziehungen" @@ -4763,7 +4978,8 @@ msgid "Active Tasks" msgstr "Aktive Aufgaben" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5157,9 +5373,14 @@ msgid "No instances found" msgstr "Keine Instanzen gefunden" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Import stoppen?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "Diese Aktion wird den Import des Accounts abbrechen, bevor er abgeschlossen ist und kann nicht rÃŧckgängig gemacht werden" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Neue Importe starten deaktivieren" @@ -5172,70 +5393,107 @@ msgstr "Dies ist nur fÃŧr den Einsatz gedacht, wenn bei Importen etwas sehr schi msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Während Importe deaktiviert sind, dÃŧrfen Benutzer keine neuen Importe starten, aber bestehende Importe werden nicht beeinträchtigt." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "Diese Einstellung verhindert sowohl Importe von BÃŧchern als auch von Importe von Accounts." + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Importe deaktivieren" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Benutzer*innen kÃļnnen derzeit keine neuen Importe starten" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Importe aktivieren" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Anzahl der Importe begrenzen" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Einige Nutzer kÃļnnten versuchen eine große Anzahl von BÃŧchern zu importieren, was sie eventuell verhindern mÃļchten." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Setzen Sie den Wert auf 0, falls sie keine Limitierung wÃŧnschen." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Setze Importlimit auf" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "BÃŧcher alle" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "Tage." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Limit festlegen" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "Beschränke, wie oft Benutzer*innen importieren und exportieren kÃļnnen" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "Einige Benutzer*innen versuchen vielleicht, ihre Importe oder Exporte sehr häufig durchzufÃŧhren. Das kannst Du beschränken." + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "Beschränke Importe und Exporte von Benutzer*innen auf einmal pro " + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "Stunden" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "Limit ändern" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "Buch-Importe" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Abgeschlossen" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Benutzer*in" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Aktualisierungsdatum" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Ausstehende Einträge" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Erfolgreiche Objekte" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Keine passenden Importe gefunden." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "Benutzerimporte" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5722,7 +5980,7 @@ msgstr "Instanz-Standard-Design festlegen" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Eines deiner Designs scheint defekt zu sein. Wenn du dieses Design auswählst, wird die Anwendung unbenutzbar." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5776,15 +6034,15 @@ msgstr "Design lÃļschen" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Teste das Design" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Defektes Design" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Erfolgreich geladen" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5833,7 +6091,7 @@ msgstr "Nicht festgelegt" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Dieser Akteur signiert HTTP-Requests fÃŧr diese Instanz." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5905,15 +6163,15 @@ msgstr "Benutzeraktionen" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Administrativer Akteur der Instanz" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Du darfst diesen Account nicht lÃļschen oder deaktivieren, da er fÃŧr den Betrieb des Servers notwendig ist. Dieser Akteur signiert ausgehende GET-Requests zur reibungslosen Interaktion mit sicheren ActivityPub-Servern." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Dieser Account kann von regulären Benutzer*innen nicht gefunden werden und hat keine Profilseite." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6048,17 +6306,15 @@ msgstr "Regal erstellen" msgid "Edit Shelf" msgstr "Regal bearbeiten" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Profil" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Alle BÃŧcher" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "BÃŧcher importieren" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6069,7 +6325,7 @@ msgstr[1] "%(formatted_count)s BÃŧcher" #: bookwyrm/templates/shelf/shelf.html:106 #, python-format msgid "(showing %(start)s-%(end)s)" -msgstr "(Anzeige: %(start)s&endash;%(end)s)" +msgstr "(Anzeige: %(start)s-%(end)s)" #: bookwyrm/templates/shelf/shelf.html:118 msgid "Edit shelf" @@ -6412,7 +6668,7 @@ msgstr "Folgen Sie beim neuen Konto" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s ist umgezogen zu %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 9c51fbbd5..61add13ef 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: 2024-01-02 03:27+0000\n" +"POT-Creation-Date: 2024-03-25 23:12+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -87,7 +87,7 @@ msgstr "" msgid "Incorrect code" msgstr "" -#: bookwyrm/forms/links.py:36 +#: bookwyrm/forms/links.py:37 msgid "This domain is blocked. Please contact your administrator if you think this is an error." msgstr "" @@ -103,8 +103,8 @@ msgstr "" msgid "Book Title" msgstr "" -#: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:158 -#: bookwyrm/templates/shelf/shelf.html:190 +#: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:159 +#: bookwyrm/templates/shelf/shelf.html:191 #: bookwyrm/templates/snippets/create_status/review.html:32 msgid "Rating" msgstr "" @@ -173,23 +173,23 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:282 +#: bookwyrm/models/book.py:324 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:283 +#: bookwyrm/models/book.py:325 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:284 +#: bookwyrm/models/book.py:326 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:285 +#: bookwyrm/models/book.py:327 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:286 +#: bookwyrm/models/book.py:328 msgid "Paperback" msgstr "" @@ -263,9 +263,9 @@ msgstr "" #: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:173 #: bookwyrm/templates/import/import_user.html:211 -#: bookwyrm/templates/preferences/export-user.html:112 -#: bookwyrm/templates/settings/imports/imports.html:131 -#: bookwyrm/templates/settings/imports/imports.html:221 +#: bookwyrm/templates/preferences/export-user.html:121 +#: bookwyrm/templates/settings/imports/imports.html:180 +#: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "" @@ -273,7 +273,7 @@ msgstr "" #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 #: bookwyrm/templates/import/import.html:171 #: bookwyrm/templates/import/import_user.html:209 -#: bookwyrm/templates/preferences/export-user.html:110 +#: bookwyrm/templates/preferences/export-user.html:119 msgid "Complete" msgstr "" @@ -364,7 +364,34 @@ msgstr "" msgid "Deleted item" msgstr "" -#: bookwyrm/models/user.py:33 bookwyrm/templates/book/book.html:307 +#: bookwyrm/models/status.py:186 +#, python-format +msgid "%(display_name)s's status" +msgstr "" + +#: bookwyrm/models/status.py:361 +#, python-format +msgid "%(display_name)s's comment on %(book_title)s" +msgstr "" + +#: bookwyrm/models/status.py:412 +#, python-format +msgid "%(display_name)s's quote from %(book_title)s" +msgstr "" + +#: bookwyrm/models/status.py:448 +#, python-format +msgid "%(display_name)s's review of %(book_title)s" +msgstr "" + +#: bookwyrm/models/status.py:479 +#, python-format +msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" +msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/models/user.py:33 bookwyrm/templates/book/book.html:312 msgid "Reviews" msgstr "" @@ -380,107 +407,111 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:232 +#: bookwyrm/settings.py:236 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:232 +#: bookwyrm/settings.py:236 msgid "Home" msgstr "" -#: bookwyrm/settings.py:233 +#: bookwyrm/settings.py:237 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:233 +#: bookwyrm/settings.py:237 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/search/layout.html:22 -#: bookwyrm/templates/search/layout.html:43 +#: bookwyrm/templates/search/layout.html:44 #: bookwyrm/templates/user/layout.html:107 msgid "Books" msgstr "" -#: bookwyrm/settings.py:313 +#: bookwyrm/settings.py:317 msgid "English" msgstr "" -#: bookwyrm/settings.py:314 +#: bookwyrm/settings.py:318 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:319 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:320 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:321 msgid "EspaÃąol (Spanish)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:322 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:323 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:324 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:321 -msgid "Suomi (Finnish)" -msgstr "" - -#: bookwyrm/settings.py:322 -msgid "Français (French)" -msgstr "" - -#: bookwyrm/settings.py:323 -msgid "LietuviÅŗ (Lithuanian)" -msgstr "" - -#: bookwyrm/settings.py:324 -msgid "Nederlands (Dutch)" -msgstr "" - #: bookwyrm/settings.py:325 -msgid "Norsk (Norwegian)" +msgid "한ęĩ­ė–´ (Korean)" msgstr "" #: bookwyrm/settings.py:326 -msgid "Polski (Polish)" +msgid "Suomi (Finnish)" msgstr "" #: bookwyrm/settings.py:327 -msgid "PortuguÃĒs do Brasil (Brazilian Portuguese)" +msgid "Français (French)" msgstr "" #: bookwyrm/settings.py:328 -msgid "PortuguÃĒs Europeu (European Portuguese)" +msgid "LietuviÅŗ (Lithuanian)" msgstr "" #: bookwyrm/settings.py:329 -msgid "RomÃĸnă (Romanian)" +msgid "Nederlands (Dutch)" msgstr "" #: bookwyrm/settings.py:330 -msgid "Svenska (Swedish)" +msgid "Norsk (Norwegian)" msgstr "" #: bookwyrm/settings.py:331 -msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" +msgid "Polski (Polish)" msgstr "" #: bookwyrm/settings.py:332 -msgid "įŽ€äŊ“中文 (Simplified Chinese)" +msgid "PortuguÃĒs do Brasil (Brazilian Portuguese)" msgstr "" #: bookwyrm/settings.py:333 +msgid "PortuguÃĒs Europeu (European Portuguese)" +msgstr "" + +#: bookwyrm/settings.py:334 +msgid "RomÃĸnă (Romanian)" +msgstr "" + +#: bookwyrm/settings.py:335 +msgid "Svenska (Swedish)" +msgstr "" + +#: bookwyrm/settings.py:336 +msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" +msgstr "" + +#: bookwyrm/settings.py:337 +msgid "įŽ€äŊ“中文 (Simplified Chinese)" +msgstr "" + +#: bookwyrm/settings.py:338 msgid "įšéĢ”中文 (Traditional Chinese)" msgstr "" @@ -518,10 +549,7 @@ msgid "The file you are uploading is too large." msgstr "" #: bookwyrm/templates/413.html:11 -msgid "" -"\n" -" You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" -" " +msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." msgstr "" #: bookwyrm/templates/500.html:4 @@ -728,7 +756,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:65 +#: bookwyrm/templates/book/book.html:70 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -816,24 +844,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:95 -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:180 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:100 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:142 +#: bookwyrm/templates/book/book.html:147 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:104 -#: bookwyrm/templates/book/book.html:146 +#: bookwyrm/templates/book/book.html:151 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:119 -#: bookwyrm/templates/book/book.html:160 +#: bookwyrm/templates/book/book.html:165 msgid "View on Inventaire" msgstr "" @@ -895,50 +923,54 @@ msgstr "" msgid "Wikipedia link:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:60 +#: bookwyrm/templates/author/edit_author.html:58 +msgid "Wikidata:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:62 msgid "Website:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:67 msgid "Birth date:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:72 +#: bookwyrm/templates/author/edit_author.html:74 msgid "Death date:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:79 +#: bookwyrm/templates/author/edit_author.html:81 msgid "Author Identifiers" msgstr "" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:83 msgid "Openlibrary key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:88 +#: bookwyrm/templates/author/edit_author.html:90 #: bookwyrm/templates/book/edit/edit_book_form.html:334 msgid "Inventaire ID:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:95 +#: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:102 +#: bookwyrm/templates/author/edit_author.html:104 #: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Goodreads key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:111 msgid "ISFDB:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:116 +#: bookwyrm/templates/author/edit_author.html:118 msgid "ISNI:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:126 -#: bookwyrm/templates/book/book.html:220 +#: bookwyrm/templates/author/edit_author.html:128 +#: bookwyrm/templates/book/book.html:225 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -960,9 +992,9 @@ msgstr "" msgid "Save" msgstr "" -#: bookwyrm/templates/author/edit_author.html:127 +#: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:221 +#: bookwyrm/templates/book/book.html:226 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1001,93 +1033,93 @@ msgstr "" msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:20 +#: bookwyrm/templates/book/book.html:21 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:73 bookwyrm/templates/book/book.html:74 +#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:99 bookwyrm/templates/book/book.html:102 +#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:108 +#: bookwyrm/templates/book/book.html:113 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:119 +#: bookwyrm/templates/book/book.html:124 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:196 +#: bookwyrm/templates/book/book.html:201 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:209 +#: bookwyrm/templates/book/book.html:214 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:216 +#: bookwyrm/templates/book/book.html:221 #: bookwyrm/templates/book/edit/edit_book_form.html:53 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:232 +#: bookwyrm/templates/book/book.html:237 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:251 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:261 +#: bookwyrm/templates/book/book.html:266 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:277 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:278 +#: bookwyrm/templates/book/book.html:283 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:286 +#: bookwyrm/templates/book/book.html:291 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:317 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:318 +#: bookwyrm/templates/book/book.html:323 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:324 +#: bookwyrm/templates/book/book.html:329 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:365 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:372 +#: bookwyrm/templates/book/book.html:377 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:383 +#: bookwyrm/templates/book/book.html:388 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1095,18 +1127,18 @@ msgstr "" #: bookwyrm/templates/layout.html:88 bookwyrm/templates/lists/curate.html:8 #: bookwyrm/templates/lists/list.html:12 bookwyrm/templates/lists/lists.html:5 #: bookwyrm/templates/lists/lists.html:12 -#: bookwyrm/templates/search/layout.html:26 -#: bookwyrm/templates/search/layout.html:51 +#: bookwyrm/templates/search/layout.html:27 +#: bookwyrm/templates/search/layout.html:55 #: bookwyrm/templates/settings/celery.html:77 #: bookwyrm/templates/user/layout.html:101 bookwyrm/templates/user/lists.html:6 msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:395 +#: bookwyrm/templates/book/book.html:400 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:405 +#: bookwyrm/templates/book/book.html:410 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1236,7 +1268,7 @@ msgid "This is a new work" msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:139 -#: bookwyrm/templates/feed/status.html:19 +#: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 #: bookwyrm/templates/guided_tour/book.html:91 @@ -1342,6 +1374,8 @@ msgid "Published date:" msgstr "" #: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/search/layout.html:23 +#: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" @@ -1374,7 +1408,7 @@ msgid "Add Another Author" msgstr "" #: bookwyrm/templates/book/edit/edit_book_form.html:231 -#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:150 msgid "Cover" msgstr "" @@ -1499,9 +1533,9 @@ msgstr "" #: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:177 -#: bookwyrm/templates/preferences/export-user.html:78 +#: bookwyrm/templates/preferences/export-user.html:87 #: bookwyrm/templates/settings/announcements/announcements.html:37 -#: bookwyrm/templates/settings/imports/imports.html:255 +#: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1513,8 +1547,8 @@ msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:174 -#: bookwyrm/templates/settings/imports/imports.html:253 +#: bookwyrm/templates/settings/imports/imports.html:223 +#: bookwyrm/templates/settings/imports/imports.html:302 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -1644,7 +1678,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2102,7 +2136,7 @@ msgstr "" #: bookwyrm/templates/layout.html:48 bookwyrm/templates/lists/list.html:217 #: bookwyrm/templates/search/layout.html:5 #: bookwyrm/templates/search/layout.html:10 -#: bookwyrm/templates/search/layout.html:32 +#: bookwyrm/templates/search/layout.html:33 msgid "Search" msgstr "" @@ -2754,6 +2788,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_groups.html:11 #: bookwyrm/templates/guided_tour/user_profile.html:55 +#: bookwyrm/templates/preferences/export-user.html:36 #: bookwyrm/templates/user/groups.html:6 bookwyrm/templates/user/layout.html:95 msgid "Groups" msgstr "" @@ -2943,8 +2978,8 @@ msgstr "" #: bookwyrm/templates/import/import.html:129 #: bookwyrm/templates/import/import_user.html:171 -#: bookwyrm/templates/settings/imports/imports.html:153 -#: bookwyrm/templates/settings/imports/imports.html:243 +#: bookwyrm/templates/settings/imports/imports.html:202 +#: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" @@ -2954,13 +2989,13 @@ msgid "Last Updated" msgstr "" #: bookwyrm/templates/import/import.html:135 -#: bookwyrm/templates/settings/imports/imports.html:162 +#: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" #: bookwyrm/templates/import/import.html:144 #: bookwyrm/templates/import/import_user.html:183 -#: bookwyrm/templates/preferences/export-user.html:87 +#: bookwyrm/templates/preferences/export-user.html:96 msgid "No recent imports" msgstr "" @@ -2996,8 +3031,8 @@ msgid "Refresh" msgstr "" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:194 -#: bookwyrm/templates/settings/imports/imports.html:271 +#: bookwyrm/templates/settings/imports/imports.html:243 +#: bookwyrm/templates/settings/imports/imports.html:320 msgid "Stop import" msgstr "" @@ -3029,8 +3064,8 @@ msgid "Row" msgstr "" #: bookwyrm/templates/import/import_status.html:110 -#: bookwyrm/templates/shelf/shelf.html:150 -#: bookwyrm/templates/shelf/shelf.html:172 +#: bookwyrm/templates/shelf/shelf.html:151 +#: bookwyrm/templates/shelf/shelf.html:173 msgid "Title" msgstr "" @@ -3043,8 +3078,8 @@ msgid "Openlibrary key" msgstr "" #: bookwyrm/templates/import/import_status.html:121 -#: bookwyrm/templates/shelf/shelf.html:151 -#: bookwyrm/templates/shelf/shelf.html:175 +#: bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:176 msgid "Author" msgstr "" @@ -3136,6 +3171,7 @@ msgid "Deselect any checkboxes for data you do not wish to include in your impor msgstr "" #: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/preferences/export-user.html:20 #: bookwyrm/templates/shelf/shelf.html:26 #: bookwyrm/templates/user/relationships/followers.html:18 #: bookwyrm/templates/user/relationships/following.html:18 @@ -3191,6 +3227,7 @@ msgid "User blocks" msgstr "" #: bookwyrm/templates/import/import_user.html:123 +#: bookwyrm/templates/preferences/export-user.html:22 msgid "Reading goals" msgstr "" @@ -3199,14 +3236,17 @@ msgid "Overwrites reading goals for all years listed in the import file" msgstr "" #: bookwyrm/templates/import/import_user.html:130 +#: bookwyrm/templates/preferences/export-user.html:23 msgid "Shelves" msgstr "" #: bookwyrm/templates/import/import_user.html:133 +#: bookwyrm/templates/preferences/export-user.html:24 msgid "Reading history" msgstr "" #: bookwyrm/templates/import/import_user.html:136 +#: bookwyrm/templates/preferences/export-user.html:25 msgid "Book reviews" msgstr "" @@ -3242,7 +3282,7 @@ msgid "Reject" msgstr "" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:171 +#: bookwyrm/templates/settings/imports/imports.html:220 msgid "Failed items" msgstr "" @@ -3272,8 +3312,8 @@ msgstr "" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:48 -#: bookwyrm/templates/landing/reactivate.html:41 +#: bookwyrm/templates/landing/login.html:50 +#: bookwyrm/templates/landing/reactivate.html:43 msgid "Create an Account" msgstr "" @@ -3324,7 +3364,7 @@ msgid "Login" msgstr "" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:142 +#: bookwyrm/templates/landing/login.html:38 bookwyrm/templates/layout.html:142 #: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "" @@ -3340,22 +3380,22 @@ msgstr "" msgid "Username:" msgstr "" -#: bookwyrm/templates/landing/login.html:27 +#: bookwyrm/templates/landing/login.html:28 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/landing/reactivate.html:23 +#: bookwyrm/templates/landing/reactivate.html:24 #: bookwyrm/templates/layout.html:132 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/preferences/2fa.html:91 #: bookwyrm/templates/snippets/register_form.html:45 msgid "Password:" msgstr "" -#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:139 +#: bookwyrm/templates/landing/login.html:41 bookwyrm/templates/layout.html:139 #: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "" -#: bookwyrm/templates/landing/login.html:61 -#: bookwyrm/templates/landing/reactivate.html:54 +#: bookwyrm/templates/landing/login.html:63 +#: bookwyrm/templates/landing/reactivate.html:56 msgid "More about this site" msgstr "" @@ -3383,7 +3423,7 @@ msgstr "" msgid "Reactivate Account" msgstr "" -#: bookwyrm/templates/landing/reactivate.html:32 +#: bookwyrm/templates/landing/reactivate.html:34 msgid "Reactivate account" msgstr "" @@ -3393,7 +3433,7 @@ msgid "%(site_name)s search" msgstr "" #: bookwyrm/templates/layout.html:39 -msgid "Search for a book, user, or list" +msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 @@ -4420,44 +4460,86 @@ msgstr "" msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." msgstr "" -#: bookwyrm/templates/preferences/export-user.html:17 -msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +#: bookwyrm/templates/preferences/export-user.html:18 +msgid "Your file will include:" msgstr "" -#: bookwyrm/templates/preferences/export-user.html:43 +#: bookwyrm/templates/preferences/export-user.html:21 +msgid "Most user settings" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:26 +#: bookwyrm/templates/settings/dashboard/dashboard.html:27 +msgid "Statuses" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:27 +msgid "Your own lists and saved lists" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:28 +msgid "Which users you follow and block" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:32 +msgid "Your file will not include:" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:34 +msgid "Direct messages" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:35 +msgid "Replies to your statuses" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:37 +msgid "Favorites" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:41 msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." msgstr "" -#: bookwyrm/templates/preferences/export-user.html:46 +#: bookwyrm/templates/preferences/export-user.html:44 msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." msgstr "" -#: bookwyrm/templates/preferences/export-user.html:51 +#: bookwyrm/templates/preferences/export-user.html:49 +msgid "New user exports are currently disabled." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:53 +#, python-format +msgid "User exports settings can be changed from the Imports page in the Admin dashboard." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 #, python-format msgid "You will be able to create a new export file at %(next_available)s" msgstr "" -#: bookwyrm/templates/preferences/export-user.html:60 +#: bookwyrm/templates/preferences/export-user.html:69 msgid "Create user export file" msgstr "" -#: bookwyrm/templates/preferences/export-user.html:67 +#: bookwyrm/templates/preferences/export-user.html:76 msgid "Recent Exports" msgstr "" -#: bookwyrm/templates/preferences/export-user.html:69 +#: bookwyrm/templates/preferences/export-user.html:78 msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." msgstr "" -#: bookwyrm/templates/preferences/export-user.html:75 +#: bookwyrm/templates/preferences/export-user.html:84 msgid "Date" msgstr "" -#: bookwyrm/templates/preferences/export-user.html:81 +#: bookwyrm/templates/preferences/export-user.html:90 msgid "Size" msgstr "" -#: bookwyrm/templates/preferences/export-user.html:125 +#: bookwyrm/templates/preferences/export-user.html:134 msgid "Download your export" msgstr "" @@ -4689,8 +4771,8 @@ msgstr "" msgid "Search type" msgstr "" -#: bookwyrm/templates/search/layout.html:24 -#: bookwyrm/templates/search/layout.html:47 +#: bookwyrm/templates/search/layout.html:25 +#: bookwyrm/templates/search/layout.html:51 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:27 #: bookwyrm/templates/settings/federation/instance_list.html:52 #: bookwyrm/templates/settings/layout.html:36 @@ -4700,12 +4782,12 @@ msgstr "" msgid "Users" msgstr "" -#: bookwyrm/templates/search/layout.html:59 +#: bookwyrm/templates/search/layout.html:63 #, python-format msgid "No results found for \"%(query)s\"" msgstr "" -#: bookwyrm/templates/search/layout.html:61 +#: bookwyrm/templates/search/layout.html:65 #, python-format msgid "%(result_count)s result found" msgid_plural "%(result_count)s results found" @@ -4727,7 +4809,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:99 +#: bookwyrm/templates/settings/layout.html:103 msgid "Announcements" msgstr "" @@ -4745,13 +4827,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:80 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:86 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -4977,8 +5059,9 @@ msgid "Active Tasks" msgstr "" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:146 -#: bookwyrm/templates/settings/imports/imports.html:236 +#: bookwyrm/templates/settings/imports/imports.html:195 +#: bookwyrm/templates/settings/imports/imports.html:285 +#: bookwyrm/templates/settings/schedules.html:95 msgid "ID" msgstr "" @@ -5030,7 +5113,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:109 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5039,40 +5122,36 @@ msgstr "" msgid "Active this month" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:27 -msgid "Statuses" -msgstr "" - #: bookwyrm/templates/settings/dashboard/dashboard.html:33 #: bookwyrm/templates/settings/dashboard/works_chart.html:11 msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:74 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:92 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:115 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5088,6 +5167,14 @@ msgstr "" msgid "Total" msgstr "" +#: bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html:12 +msgid "Would you like to automatically check for new BookWyrm releases? (recommended)" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html:20 +msgid "Schedule checks" +msgstr "" + #: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 #, python-format msgid "%(display_count)s domain needs review" @@ -5168,7 +5255,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:94 msgid "Email Configuration" msgstr "" @@ -5417,7 +5504,7 @@ msgid "Some users might try to import a large number of books, which you want to msgstr "" #: bookwyrm/templates/settings/imports/imports.html:76 -#: bookwyrm/templates/settings/imports/imports.html:108 +#: bookwyrm/templates/settings/imports/imports.html:135 msgid "Set the value to 0 to not enforce any limit." msgstr "" @@ -5437,59 +5524,87 @@ msgstr "" msgid "Set limit" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:96 +#: bookwyrm/templates/settings/imports/imports.html:98 +msgid "Disable starting new user exports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:109 +msgid "This is only intended to be used when things have gone very wrong with exports and you need to pause the feature while addressing issues." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:110 +msgid "While exports are disabled, users will not be allowed to start new user exports, but existing exports will not be affected." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:115 +msgid "Disable user exports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:123 msgid "Limit how often users can import and export" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:107 +#: bookwyrm/templates/settings/imports/imports.html:134 msgid "Some users might try to run user imports or exports very frequently, which you want to limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:111 -msgid "Restrict user imports and exports to once every " +#: bookwyrm/templates/settings/imports/imports.html:138 +msgid "Limit how often users can import and export user data" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:140 msgid "hours" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:117 +#: bookwyrm/templates/settings/imports/imports.html:144 msgid "Change limit" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:159 +msgid "Users are currently unable to start new user exports. This is the default setting." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:161 +msgid "It is not currently possible to provide user exports when using s3 storage. The BookWyrm development team are working on a fix for this." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:167 +msgid "Enable user exports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:174 msgid "Book Imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:135 -#: bookwyrm/templates/settings/imports/imports.html:225 +#: bookwyrm/templates/settings/imports/imports.html:184 +#: bookwyrm/templates/settings/imports/imports.html:274 msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:149 -#: bookwyrm/templates/settings/imports/imports.html:239 +#: bookwyrm/templates/settings/imports/imports.html:198 +#: bookwyrm/templates/settings/imports/imports.html:288 msgid "User" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:158 -#: bookwyrm/templates/settings/imports/imports.html:248 +#: bookwyrm/templates/settings/imports/imports.html:207 +#: bookwyrm/templates/settings/imports/imports.html:297 msgid "Date Updated" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:165 +#: bookwyrm/templates/settings/imports/imports.html:214 msgid "Pending items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:168 +#: bookwyrm/templates/settings/imports/imports.html:217 msgid "Successful items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:203 -#: bookwyrm/templates/settings/imports/imports.html:295 +#: bookwyrm/templates/settings/imports/imports.html:252 +#: bookwyrm/templates/settings/imports/imports.html:344 msgid "No matching imports found." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:215 +#: bookwyrm/templates/settings/imports/imports.html:264 msgid "User Imports" msgstr "" @@ -5670,18 +5785,24 @@ msgstr "" msgid "Celery status" msgstr "" -#: bookwyrm/templates/settings/layout.html:95 +#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/schedules.html:7 +#: bookwyrm/templates/settings/schedules.html:11 +msgid "Scheduled tasks" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:99 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:103 +#: bookwyrm/templates/settings/layout.html:107 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:109 -#: bookwyrm/templates/settings/layout.html:112 +#: bookwyrm/templates/settings/layout.html:113 +#: bookwyrm/templates/settings/layout.html:116 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -5689,7 +5810,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:118 +#: bookwyrm/templates/settings/layout.html:122 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -5895,6 +6016,56 @@ msgstr "" msgid "No reports found." msgstr "" +#: bookwyrm/templates/settings/schedules.html:17 +#: bookwyrm/templates/settings/schedules.html:101 +msgid "Tasks" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:25 +msgid "Celery task" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:28 +msgid "Date changed" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:31 +msgid "Last run at" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:34 +#: bookwyrm/templates/settings/schedules.html:98 +msgid "Schedule" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:37 +msgid "Schedule ID" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:40 +msgid "Enabled" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:73 +msgid "Un-schedule" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:81 +msgid "No scheduled tasks" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:90 +msgid "Schedules" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:119 +msgid "No schedules found" +msgstr "" + #: bookwyrm/templates/settings/site.html:10 #: bookwyrm/templates/settings/site.html:43 msgid "Instance Info" @@ -6306,7 +6477,7 @@ msgid "Edit Shelf" msgstr "" #: bookwyrm/templates/shelf/shelf.html:41 -#: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 +#: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:59 msgid "All books" msgstr "" @@ -6321,43 +6492,56 @@ msgid_plural "%(formatted_count)s books" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/shelf/shelf.html:106 +#: bookwyrm/templates/shelf/shelf.html:105 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:118 +#: bookwyrm/templates/shelf/shelf.html:119 msgid "Edit shelf" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:126 +#: bookwyrm/templates/shelf/shelf.html:127 msgid "Delete shelf" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:154 -#: bookwyrm/templates/shelf/shelf.html:180 +#: bookwyrm/templates/shelf/shelf.html:155 +#: bookwyrm/templates/shelf/shelf.html:181 msgid "Shelved" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:155 -#: bookwyrm/templates/shelf/shelf.html:183 +#: bookwyrm/templates/shelf/shelf.html:156 +#: bookwyrm/templates/shelf/shelf.html:184 msgid "Started" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:156 -#: bookwyrm/templates/shelf/shelf.html:186 +#: bookwyrm/templates/shelf/shelf.html:157 +#: bookwyrm/templates/shelf/shelf.html:187 msgid "Finished" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:156 -#: bookwyrm/templates/shelf/shelf.html:186 +#: bookwyrm/templates/shelf/shelf.html:157 +#: bookwyrm/templates/shelf/shelf.html:187 msgid "Until" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:212 +#: bookwyrm/templates/shelf/shelf.html:216 +#, python-format +msgid "We couldn't find any books that matched %(shelves_filter_query)s" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:220 msgid "This shelf is empty." msgstr "" +#: bookwyrm/templates/shelf/shelves_filter_field.html:6 +msgid "Filter by keyword" +msgstr "" + +#: bookwyrm/templates/shelf/shelves_filter_field.html:7 +msgid "Enter text here" +msgstr "" + #: bookwyrm/templates/snippets/add_to_group_button.html:16 msgid "Invite" msgstr "" @@ -6488,7 +6672,7 @@ msgstr "" msgid "At percent:" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:69 +#: bookwyrm/templates/snippets/create_status/quotation.html:68 msgid "to" msgstr "" @@ -7185,6 +7369,10 @@ msgstr[1] "" msgid "%(title)s: %(subtitle)s" msgstr "" +#: bookwyrm/templatetags/utilities.py:129 +msgid "a new user account" +msgstr "" + #: bookwyrm/views/rss_feed.py:35 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/eo_UY/LC_MESSAGES/django.mo b/locale/eo_UY/LC_MESSAGES/django.mo index 5f0b83ecbc7c750295ef2399ac1b273f37ecb9f1..f97f6783c3b6d916b138bb241d76175a60ba9068 100644 GIT binary patch delta 35498 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 diff --git a/locale/eo_UY/LC_MESSAGES/django.po b/locale/eo_UY/LC_MESSAGES/django.po index 2b04f98b6..7223a1327 100644 --- a/locale/eo_UY/LC_MESSAGES/django.po +++ b/locale/eo_UY/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-13 14:18\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Esperanto\n" "Language: eo\n" @@ -54,19 +54,19 @@ msgstr "Pasvorto ne kongruas" msgid "Incorrect Password" msgstr "Malĝusta pasvorto" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Dato de fino de legado ne povas esti antaÅ­ la dato de komenco." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "La dato de halto de legado ne povas esti antaÅ­ la komenca dato." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "La dato de halto de legado ne povas esti en la estonteco." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "La dato de fino de legado ne povas esti en la estonteco." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "AÅ­tomate generita raporto" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Atendata" @@ -258,17 +259,24 @@ msgstr "Sekvantoj" msgid "Private" msgstr "Privata" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktiva" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Finita" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Haltigita" @@ -284,6 +292,10 @@ msgstr "Eraro dum la importo de la libro" msgid "Could not find a match for book" msgstr "Kongrua libro ne troviĝis" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Malsukcesis" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Senpaga" @@ -359,7 +371,7 @@ msgstr "Recenzoj" msgid "Comments" msgstr "Komentoj" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "CitaÄĩoj" @@ -461,7 +473,7 @@ msgstr "Svenska (Sveda)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (la ukraina)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (Tradicia ĉina)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Ho, ve!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Mankas permeso" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Vi ne rajtas rigardi tiun ĉi paĝon aÅ­ plenumi tiun ĉi agon. Via permesa nivelo estas %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Se vi kredas, ke vi havu aliron, bonvolu paroli al via BookWyrm-servilo-administranto." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,19 @@ msgstr "La paĝo kiun vi petis ŝajne ne ekzistas!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Dosiero tro granda" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "La dosiero, kiun vi estas alŝutanta, estas tro granda." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +" Vi povas uzi malpli grandan dosieron aÅ­ peti vian BookWyrm-servilo-administranto pligrandigi la agordon DATA_UPLOAD_MAX_MEMORY_SIZE.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +978,7 @@ msgstr "Konservi" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +996,7 @@ msgstr "La ŝarĝado konektos al %(source_name)s kaj kontrolos #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Konfirmi" @@ -1480,9 +1496,12 @@ msgid "Domain" msgstr "Domajno" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1513,8 @@ msgstr "Stato" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2547,7 +2567,7 @@ msgstr "Strikodolegilo" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Uzu la ligilojn Listoj, Malkovri kaj Viaj libroj por malkovri leg-proponojn kaj la lastatempajn okazaÄĩojn en tiu servilo, aÅ­ por vidi viajn katalogitajn librojn!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,7 +2599,7 @@ msgstr "Atentigoj" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Viaj profilo, uzanto-adresaro, rektaj mesaĝoj kaj agordoj estas alireblaj per alklako de via nomo en ĉi tiu menuo." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2826,111 +2846,121 @@ msgid "No activities for this hashtag yet!" msgstr "AnkoraÅ­ neniu agado por ĉi tiu kradvorto!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importi librojn" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Importi libro-liston" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "La CSV-a dosiero ne validas" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Aktuale vi rajtas importi %(display_size)s librojn ĉiun %(import_limit_reset)s tagon." msgstr[1] "Aktuale vi rajtas importi %(display_size)s librojn ĉiujn %(import_limit_reset)s tagojn." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "Restas al vi %(display_left)s." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Averaĝe, lastatempaj importoj bezonis %(hours)s horojn." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Averaĝe, lastatempaj importoj bezonis %(minutes)s minutojn." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Fonto de la datumoj:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Vi povas elŝuti vian datumaron de Goodreads per la paĝo Import/Export de via konto ĉe Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Datumdosiero:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Inkluzivi recenzojn" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Agordo de privateco por importitaj recenzoj:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importi" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Vi atingis la limon de importado." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Oni provizore malŝaltis importadon; dankon pro via pacienco." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Lastatempaj importoj" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Dato de kreado" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Lasta ĝisdatigo" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "AÄĩoj" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Neniu lastatempa importo" @@ -2966,7 +2996,8 @@ msgid "Refresh" msgstr "Aktualigi" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Ĉesigi la importon" @@ -3064,6 +3095,133 @@ msgstr "Ĉi tiu importo estas en malnova formata kiu ne plu estas subtenata. Se msgid "Update import" msgstr "Ĝisdatigi la importon" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Importi BookWyrm-konton" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "La import-dosiero ne validas" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Paŝo 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Paŝo 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Profilo" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "Ĉu via konto estu proponata al aliaj uzantoj" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Via horzono" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Bretoj" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3242,7 @@ msgid "Reject" msgstr "Malaprobi" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Malsukcesaj aÄĩoj" @@ -3747,8 +3905,8 @@ msgstr "%(related_user)s invitis vin aliĝ #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nova invito-peto atendanta respondon" +msgstr[1] "%(display_count)s novaj invito-petoj atendantaj respondon" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4022,16 @@ msgstr "ŝanĝis la nomon de la grupo %(group_name)s< msgid "has changed the description of %(group_name)s" msgstr "ŝanĝis la priskribon de la grupo %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Forigi la atentigojn" @@ -4107,7 +4275,7 @@ msgstr "Forigi alinomon" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Blokitaj uzantoj" @@ -4242,14 +4410,66 @@ msgstr "DefaÅ­lta privateco de afiŝoj:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Ĉu vi volas privatajn bretojn? Vi povas agordi apartan nivelon de videbleco por ĉiu breto. Iru al Viaj libroj, elektu breton per la langetoj, kaj alklaku ÂĢModifi bretonÂģ." +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Lastatempaj eksportoj" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Dato" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "Grandeco" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSV-a eksporto" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Via eksporto inkluzivos ĉiujn librojn sur viaj bretoj, librojn recenzitajn de vi kaj librojn kun legadaj agoj." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4487,7 @@ msgstr "Transloki konton" msgid "Data" msgstr "Datumoj" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV-a eksporto" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Rilatoj" @@ -4762,7 +4978,8 @@ msgid "Active Tasks" msgstr "Aktivaj taskoj" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5156,9 +5373,14 @@ msgid "No instances found" msgstr "Neniu instanco troviĝis" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Ĉu ĉesigi la importon?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Malŝalti la eblon komenci novajn importojn" @@ -5171,70 +5393,107 @@ msgstr "Ĉi tio celas esti uzata nur kiam io fuŝiĝas pri importoj ĝenerale ka msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Dum importado estas malŝaltita, uzantoj ne povos komenci novajn importojn sed ekzistantaj importoj ne estos tuŝitaj." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Malŝalti importadon" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Uzantoj aktuale ne povas komenci novajn importojn" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Ŝalti importadon" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Limigi la nombron de importoj" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Kelkaj uzantoj eble provos importi grandan kvanton de libroj, kion vi volas limigi." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Agordi la valoron al 0 por ne havi limon." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Agordi la limon de importoj al po" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "libroj ĉiujn" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "tagojn." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Agordi la limon" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "horoj" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "Libro-Importoj" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Finita" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Uzanto" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Dato de ĝisdatigo" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Traktotaj aÄĩoj" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Sukcesaj aÄĩoj" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Neniu kongrua importo troviĝis." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "Uzanto-importoj" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5721,7 +5980,7 @@ msgstr "Agordi la defaÅ­ltan etoson de la instanco" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Unu el viaj etosoj ŝajnas esti rompita. Elekti tiun etoson igos la aplikaÄĩon neuzebla." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5775,15 +6034,15 @@ msgstr "Forigi etoson" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Provi etoson" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Rompita etoso" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Ŝarĝita sukcese" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5832,7 +6091,7 @@ msgstr "Ne agordita" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Tiu ĉi konto estas la aganto por subskribi HTTP-petojn." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5904,15 +6163,15 @@ msgstr "Agoj por la uzanto" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Tio estas la instanc-administrant-aganto" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Vi ne devas forigi tiun ĉi konton, ĉar ĝi estas nepra por la funkciado de via servilo. Tiu ĉi aganto subskribas elirajn GET-petojn por glatigi interagon kun sekuraj ActivityPub-serviloj." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Tiu ĉi konto ne estas detektebla al ordinaraj uzantoj kaj ne havas profilpaĝon." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6047,17 +6306,15 @@ msgstr "Krei breton" msgid "Edit Shelf" msgstr "Modifi breton" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Profilo" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Ĉiuj libroj" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importi librojn" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6411,7 +6668,7 @@ msgstr "Sekvi per la nova konto" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s translokiĝis al %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index d03e543f414fb09dc3e1f6a8f6a5c6e9ec3aa190..42c4a98a19ccb0d07a24797a91b16581ab4f9a03 100644 GIT binary patch delta 43034 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 B@}vL& delta 32514 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 diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index ce1cc4aae..e43195f31 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:11\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-15 16:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -52,23 +52,23 @@ msgstr "La contraseÃąa no coincide" #: bookwyrm/forms/edit_user.py:134 msgid "Incorrect Password" -msgstr "ContraseÃąa Incorrecta" +msgstr "ContraseÃąa incorrecta" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "La fecha final de lectura no puede ser anterior a la fecha de inicio." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." -msgstr "La fecha final de lectura no puede ser anterior a la fecha de inicio." +msgstr "La fecha de interrupciÃŗn de lectura no puede ser anterior a la fecha de inicio." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." -msgstr "La fecha de paro de lectura no puede ser en el futuro." +msgstr "La fecha de interrupciÃŗn de lectura no puede ser en el futuro." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." -msgstr "La fecha de tÊrmino de la lectura no puede ser en el futuro." +msgstr "La fecha final de lectura no puede ser en el futuro." #: bookwyrm/forms/landing.py:38 msgid "Username or password are incorrect" @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Informe generado automÃĄticamente" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Pendiente" @@ -258,17 +259,24 @@ msgstr "Seguidores" msgid "Private" msgstr "Privado" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Activo" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Completado" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Detenido" @@ -284,6 +292,10 @@ msgstr "Error en cargar libro" msgid "Could not find a match for book" msgstr "No se pudo encontrar el libro" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "FallÃŗ" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratis" @@ -359,7 +371,7 @@ msgstr "ReseÃąas" msgid "Comments" msgstr "Comentarios" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citas" @@ -461,7 +473,7 @@ msgstr "Svenska (Sueco)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (ucraniano)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (Chino tradicional)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "ÂĄOh no!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Permiso denegado" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "No tienes permiso para ver esta pÃĄgina o realizar esta acciÃŗn. Tu nivel de permisos de usuario es %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Si crees que deberías tener acceso, por favor habla con tu administrador del servidor de BookWyrm." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,19 @@ msgstr "ÂĄParece que la pÃĄgina solicitada no existe!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Archivo demasiado grande" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "El archivo que estÃĄs subiendo es demasiado grande." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +" Puedes intentar con un archivo mÃĄs pequeÃąo, o pregÃēntale a tu administrador del servidor de BookWyrm para que suba el parÃĄmetro DATA_UPLOAD_MAX_MEMORY_SIZE.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -568,11 +582,11 @@ msgstr "Los moderadores y administradores de %(site_name)s mantienen el sitio en #: bookwyrm/templates/about/about.html:122 msgid "Moderator" -msgstr "Moderador" +msgstr "Moderadore" #: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 msgid "Admin" -msgstr "Admin" +msgstr "Admin." #: bookwyrm/templates/about/about.html:140 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 @@ -597,7 +611,7 @@ msgstr "Aviso legal" #: bookwyrm/templates/about/layout.html:11 msgid "Active users:" -msgstr "Usuarios activos:" +msgstr "Usuaries activos:" #: bookwyrm/templates/about/layout.html:15 msgid "Statuses posted:" @@ -964,6 +978,7 @@ msgstr "Guardar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -972,7 +987,7 @@ msgstr "Cancelar" #: bookwyrm/templates/author/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." -msgstr "La carga de datos se conectarÃĄ a %(source_name)s y comprobarÃĄ si hay metadatos sobre este autor que no estÃĄn presentes aquí. Los metadatos existentes no serÃĄn sobrescritos." +msgstr "La carga de datos se conectarÃĄ a %(source_name)s y comprobarÃĄ si hay metadatos sobre este autore que no estÃĄn presentes aquí. Los metadatos existentes no serÃĄn sobrescritos." #: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:137 @@ -981,6 +996,7 @@ msgstr "La carga de datos se conectarÃĄ a %(source_name)s y com #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmar" @@ -1186,17 +1202,17 @@ msgstr "Confirmar informaciÃŗn de libro" #: bookwyrm/templates/book/edit/edit_book.html:78 #, python-format msgid "Is \"%(name)s\" one of these authors?" -msgstr "ÂŋEs \"%(name)s\" uno de estos autores?" +msgstr "ÂŋEs \"%(name)s\" une de estes autores?" #: bookwyrm/templates/book/edit/edit_book.html:89 #, python-format msgid "Author of %(book_title)s" -msgstr "Autor de %(book_title)s" +msgstr "Autore de %(book_title)s" #: bookwyrm/templates/book/edit/edit_book.html:93 #, python-format msgid "Author of %(alt_title)s" -msgstr "Autor de %(alt_title)s" +msgstr "Autore de %(alt_title)s" #: bookwyrm/templates/book/edit/edit_book.html:95 msgid "Find more information at isni.org" @@ -1355,7 +1371,7 @@ msgstr "María LÃŗpez García" #: bookwyrm/templates/book/edit/edit_book_form.html:221 msgid "Add Another Author" -msgstr "AÃąadir Otro Autor" +msgstr "AÃąadir otre autore" #: bookwyrm/templates/book/edit/edit_book_form.html:231 #: bookwyrm/templates/shelf/shelf.html:149 @@ -1480,9 +1496,12 @@ msgid "Domain" msgstr "Dominio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1513,8 @@ msgstr "Estado" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2547,7 +2567,7 @@ msgstr "EscÃĄner de cÃŗdigo de barras" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Usa los enlaces de Listas, Descubre, y Sus libros para descubrir sugerencias de lectura y los Ãēltimos acontecimientos en este servidor ÂĄo para ver tus libros catalogados!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,7 +2599,7 @@ msgstr "Notificaciones" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Puedes acceder a tu perfil, tus libros, tus mensajes directos y tu configuraciÃŗn haciendo clic en tu nombre en este menÃē." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2810,7 +2830,7 @@ msgstr "Ahora que entiendes lo bÃĄsico de tu pÃĄgina de perfil, vamos a aÃąadir #: bookwyrm/templates/guided_tour/user_profile.html:123 msgid "Search for a title or author to continue the tour." -msgstr "Busca un título o autor para continuar el tour." +msgstr "Busca un título o autore para continuar el tour." #: bookwyrm/templates/guided_tour/user_profile.html:124 msgid "Find a book" @@ -2826,111 +2846,121 @@ msgid "No activities for this hashtag yet!" msgstr "ÂĄEsta etiqueta no tiene aÃēn ninguna actividad!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importar libros" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Importar lista de libros" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "No es un archivo CSV vÃĄlido" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Actualmente, puedes importar %(display_size)s libros cada %(import_limit_reset)s días." msgstr[1] "Actualmente, puedes importar %(display_size)s libros cada %(import_limit_reset)s días." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "Te quedan %(display_left)s." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "En promedio, las importaciones recientes han tomado %(hours)s horas." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "En promedio, las importaciones recientes han tomado %(minutes)s minutos." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Fuente de datos:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Puede descargar tus datos de Goodreads desde la pÃĄgina de ImportaciÃŗn/ExportaciÃŗn de tu cuenta de Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Archivo de datos:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Incluir reseÃąas" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "ConfiguraciÃŗn de privacidad para las reseÃąas importadas:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Has alcanzado el límite de importaciones." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Las importaciones se han deshabilitado temporalmente, gracias por tu paciencia." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Importaciones recientes" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Fecha de CreaciÃŗn" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Última ActualizaciÃŗn" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Elementos" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "No hay ninguna importaciÃŗn reciente" @@ -2966,7 +2996,8 @@ msgid "Refresh" msgstr "Refrescar" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Parar la importaciÃŗn" @@ -3064,6 +3095,133 @@ msgstr "Esta importaciÃŗn estÃĄ en un formato antiguo que ya no es compatible. S msgid "Update import" msgstr "Actualizar importaciÃŗn" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Importar cuenta de BookWyrm" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "No es un archivo de importaciÃŗn vÃĄlido" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "Si deseas migrar otros elementos (comentarios, reseÃąas o citas), debes configurar esta cuenta con un alias desde la que estÃĄ migrando o mover esa cuenta a esta antes de importar sus datos de usuario." + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "Actualmente puedes importar un usuario cada %(user_import_hours)s horas." + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "La prÃŗxima vez podrÃĄs importar un archivo de usuario en %(next_available)s" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Paso 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "Seleccione un archivo de exportaciÃŗn generado a partir de otra cuenta de BookWyrm. El formato del archivo debe ser .tar.gz." + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Paso 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "Deseleccione cualquier casilla de verificaciÃŗn para los datos que no desea incluir en su importaciÃŗn." + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Perfil de usuario" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "Sobrescribir nombre, resumen y avatar" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Ajustes de usuario" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "Sobrescribir:" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "Si se requiere la aprobaciÃŗn manual para que otros usuarios sigan su cuenta" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "Si los seguidores se muestran en su perfil" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "Si su objetivo de lectura se muestra en su perfil" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "Si ves o no a un usuario seguir sugerencias" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "Si tu cuenta es sugerida a otros" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Su zona horaria" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "Su configuraciÃŗn de privacidad por defecto del post" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "Quienes te siguen y a quienes sigues" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Bloqueos de usuario" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "Objetivos de lectura" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "Sobrescribe los objetivos de lectura de todos los aÃąos listados en el archivo de importaciÃŗn" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Estantes" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "Historial de lectura" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "ReseÃąas de libros" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Comentarios sobre libros" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Listas de libros" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Listas guardadas" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3242,7 @@ msgid "Reject" msgstr "Rechazar" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Elementos fallidos" @@ -3747,8 +3905,8 @@ msgstr "%(related_user)s te ha invitado a #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nueva invitaciÃŗn esperando respuesta" +msgstr[1] "%(display_count)s nuevas invitaciones esperando respuesta" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4022,16 @@ msgstr "ha cambiado el nombre del grupo ÂĢ%(group_nam msgid "has changed the description of %(group_name)s" msgstr "ha cambiado la descripciÃŗn del grupo ÂĢ%(group_name)sÂģ" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "Su exportaciÃŗn de usuario estÃĄ lista." + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "Tu importaciÃŗn de usuario se ha completado." + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Borrar notificaciones" @@ -4107,7 +4275,7 @@ msgstr "Borrar alias" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Usuarios bloqueados" @@ -4242,14 +4410,66 @@ msgstr "Privacidad de publicaciÃŗn por defecto:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "ÂŋQuieres privacidad en tus estanterías? Puedes configurar un nivel de visibilidad distinto para cada una de tus estanterías. Ve a Tus libros, elige una estantería en la barra de pestaÃąas y haz clic en \"Editar estantería\"." +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "Exportar cuenta de BookWyrm" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "Puedes crear un archivo de exportaciÃŗn aquí. Esto te permitirÃĄ migrar tus datos a otra cuenta de BookWyrm." + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "

    Su archivo incluirÃĄ:

    • Perfil de usuario
    • Configuraciones de usuario
    • Metas de lectura
    • Estanterías
    • Historial de lectura
    • ReseÃąas de libros
    • Estados
    • Sus listas propias y guardadas
    • Usuarios a quien sigue y bloqueados

    Su archivo no incluirÃĄ:

    • Mensajes directos
    • Respuestas a sus estados
    • Grupos
    • Favoritos
    " + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "En su nueva cuenta de BookWyrm puede elegir quÊ importar: no tendrÃĄ que importar todo lo que se exporta." + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "Si deseas migrar otros elementos (comentarios, reseÃąas o citas), debes configurar esta cuenta con un alias desde la que estÃĄ migrando o mover esa cuenta a esta antes de importar sus datos de usuario." + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "PodrÃĄ crear un nuevo archivo de exportaciÃŗn en %(next_available)s" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "Crear archivo de exportaciÃŗn de usuario" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Exportaciones recientes" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "Los archivos de exportaciÃŗn de usuarios mostrarÃĄn 'completado' una vez listo. Esto puede tardar un poco. Haga clic en el enlace para descargar su archivo." + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Fecha" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "TamaÃąo" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "Descargar su exportaciÃŗn" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Exportar CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "Exportar lista de libros" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Se exportarÃĄn todos los libros que tengas en las estanterías, las reseÃąas y los libros que estÊs leyendo." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "Su archivo de exportaciÃŗn CSV incluirÃĄ: todos los libros de sus estanterías, libros que ha reseÃąado y libros con actividad de lectura.
    Use esto para importar desde servicios como Goodreads." #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4487,7 @@ msgstr "Mover cuenta" msgid "Data" msgstr "Datos" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "ExportaciÃŗn en CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relaciones" @@ -4763,7 +4979,8 @@ msgid "Active Tasks" msgstr "Tareas activas" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5157,9 +5374,14 @@ msgid "No instances found" msgstr "No se encontrÃŗ ningun anuncio" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "ÂŋParar la importaciÃŗn?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "Esta acciÃŗn detendrÃĄ la importaciÃŗn del usuario antes de que estÊ completa y no se puede deshacer" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Deshabilitar el inicio de nuevas importaciones" @@ -5172,70 +5394,107 @@ msgstr "Ésto es sÃŗlo para usarse en caso de que las cosas vayan realmente mal msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Mientras las importaciones estÊn deshabilitadas, los usuarios no tendrÃĄn permitido iniciar nuevas importaciones, pero las importaciones existentes no se verÃĄn afectadas." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "Esta opciÃŗn evita tanto las importaciones de libros como las importaciones de usuarios." + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Deshabilitar importaciones" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Los usuarios actualmente no pueden iniciar nuevas importaciones" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Habilitar importaciones" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Limita la cantidad de importaciones" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Algunes usuaries podrían importar gran cantidad de libros, puedes limitarlo." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Establece el valor 0 para no imponer ningÃēn límite." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Establecer límite en" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "libros cada" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "días." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Establecer límite" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "Limitar la frecuencia con la que los usuarios pueden importar y exportar" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "Algunos usuarios podrían intentar ejecutar las importaciones o exportaciones de usuarios muy frecuentemente, lo que desea limitar." + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "Restringir las importaciones y exportaciones de usuarios a una vez cada " + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "horas" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "Cambiar límite" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "Importaciones de libros" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Completado" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Usuario" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Fecha Actualizada" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Elementos pendientes" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Importaciones exitosas" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "No se han encontrado importaciones coincidentes." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "Importaciones de usuarios" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5722,7 +5981,7 @@ msgstr "Usar tema por defecto de la instancia" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Parece que uno de tus temas estÃĄ roto. Al seleccionar este tema la aplicaciÃŗn serÃĄ inutilizable." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5776,15 +6035,15 @@ msgstr "Quitar tema" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Tema de prueba" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Tema roto" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Cargado exitosamente" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5833,7 +6092,7 @@ msgstr "No establecido" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Esta cuenta es el actor de instancia para firmar peticiones HTTP." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5905,15 +6164,15 @@ msgstr "Acciones de usuario" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Este es el administrador de la instancia" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "No debe eliminar o desactivar esta cuenta ya que es crítica para el funcionamiento de su servidor. Este actor firma peticiones GET salientes para una interacciÃŗn fluida con servidores seguros de ActivityPub." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Esta cuenta no es detectable por usuarios ordinarios y no tiene una pÃĄgina de perfil." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6048,17 +6307,15 @@ msgstr "Crear estantería" msgid "Edit Shelf" msgstr "Editar Estantería" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Perfil de usuario" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Todos los libros" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importar libros" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6412,7 +6669,7 @@ msgstr "Seguir en nueva cuenta" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s se ha movido a %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format @@ -6485,7 +6742,7 @@ msgstr "Quiero leer \"%(book_title)s\"" #: bookwyrm/templates/snippets/register_form.html:18 msgid "Choose wisely! Your username cannot be changed." -msgstr "ÂĄElige bien! No podrÃĄs cambiar tu nombre du usuarie mÃĄs adelante." +msgstr "ÂĄElige bien! No podrÃĄs cambiar tu nombre de usuarie mÃĄs adelante." #: bookwyrm/templates/snippets/register_form.html:66 msgid "Sign Up" diff --git a/locale/eu_ES/LC_MESSAGES/django.mo b/locale/eu_ES/LC_MESSAGES/django.mo index de9ebaba49d73e7e47f6be86090cc49a3165d858..1767d7202c931c06cb8b0136a4688ea1e17a2160 100644 GIT binary patch delta 42892 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�NCU2nc>mBw7e+oP6tBI>M6L$$LIbtX2Umi!>9kLyZ8R&^616geP>^rX$dV$&a4-=N9|Y&J7bf*MF>)Bti> z%WUTP*OJ#GK{M%s>Tm#R>BnPsT!wk@1nPb87B$28QKnvUYgSbKAk>SiGOGOdr~&mx z^)n3hI8Tb=`PX4vLxMW|9ktgFZGo6u%+rt!)ldOc`O2uJ?tndU7-~hHpgMYI<1x3I z6-$cR(m>SHRoJGN@eaV+iULk3r2~2CAb4sDT}} zUPo=s3seX1QG1^BS2K|8sCJ4Py-pPZ+OsCMKqnjTX9_rDQ3IQ4^OstqZ2kf3SyYF2 zQRP3NW*&RH+1ga7FP%j(1`fpZdj7ox^r0~iHIS|T3}$5G_fa!^g_>F19p>XVDQbmE zp!T+*jdw(?*f5(u4z(4tPy<_T)3;y}J^zOZ=rmrzeE0^tW44{<7YEZ&OZ^gc=+f*m z9T!C%#(Jm@d!hz90Cg57p$7a5Y6}*kCK!d=@DO@+D1O*&MmP?&H`7r|xfIpmZq&!_ zWz-Cc?lBElLUmjV)nQ{)y|$>QWuQ%;gj%6rFbG$p`nkD>=U;pD)E4}N`aTeAuNiSx zRDN*`#Hy$nc1G>tP}J6qMm@H3Q623<4eSrpX}^S;$Umr+h_TPSA5!o0nt}yMP{Sor zk5xU?_w*=R@FHqPPi)+?-wZT0>P1r&^;FbG4WOw_?}D0u7d6nysFhldT7gZ<&&pT!m9mpROejniXh`8o)sGmm5Vu zGmk*ca23wOJy-)<9WpaojvBzPs1Em|4$~Ez{|I%KK4K}1^_w}Ql~9MUHU5ktsQz9X z`SYK{=I~`kJp~1DA=W|d@l(u?uTUe-dc+K<2&&<#s1>V=s^1y)xQ#(gXc|Vt6&Q$X zZ2k!h(DQ$VfM#~n`VjTG{v5T`uTcZxFZTG;W1`MTd>oH`a4NpHPCRCQkC5Sa^K(Qe z3?=^oHp2$T%}>j#aJ`=YPXsi8wI|FMi>;`c-9ioEA?h>WU-Z99PnxCAjyf~NQHQk= z>hSf)Kpc;H+*YAh;s)xlzCdkZ>_2$^RWTERwpbaphf7gQxDo5&ZX1t($~^yR@E_81 zqE;%|X*19?sMDSmb*O_-TUHJAcs8@~0jPe)o#y#hfd~>b!X>Cz>aVDoowf0&Hb2%G zGxGGP{G!$dsCqqY{y5YC7N9zcLapdtRDVZMD|_h-&%X-ZAt4Z7p=O@qta)s*U|!#ItvJB z##>MgA4cuXZPZL3VFUDBHZP9GsDX4tz0(Jwej1*R8*#g}+Z8jwv{y~N%&3k_pthto z`v3c%W&{e5&{xEggP&Y)KrHwb8if1wV^7aNa%%Pd(|97%c!)GKx;=D;hct#EIf86`s1 zPjAhG$}fp}!Bxjz*Z{Sn`)}Ll|0oGs!po=`zC<0u7I>gVhAV$AyR-_o}tTnysHHWM>2{}m^kL7R^s-u5VGyQFV z{4JP+{+*o!w3qiVHpYKq29grhU}kGk)JjxGZBYj-ieadRSE43x0JYR7Q7dv0HRGG8 zGw=xYK6#5?%`CxF^PA3WsEW-|6@yWSr7LPi<54R$#pbU-HM{{;Z>NnPLJjCN>P7Sj z)lSN1W($j<22%YQ&%Z|8lms;pjOwVHwGZkn47BlKsD{R1LR^ZfzXer)uZ2O20d?pK|7&JY4fTR*fz>e#b?A1Y zw&o>j>pU-v$x#E$i5hqz)XG)x63}6)gLyE_X3R&e#A?*QHeo~Dg*qb%Uz&lYMy*gj zRL4Q6nN~!tKy%atJK6Y9)Q8VcHtzj}fJU|))!_y#gWFI8dTHYs|1-Zz5Mq(rlS$4k*`Ay=pd?r6Q~Anp&rM? zug&9@4>f@Atc@@y@h+%|OhvWx3u;Rjp$51WwNeK$iN61zC7{#(0M+0Vj6lyD^D3Q* zYUr@_6lzH?V<0|5y_gccHR+jAGcAcaY?V+GnS**ytj8L-7o+R>kNwURNQi1EGipFZ zP$MscTABJ7iJffxGipZ3-kTX`M$If2PQntX!*ms4aVo-qHlJeK5~;FxDhK z2sPqEs0x=b6aJ0rFz!dQBB`+~@yu8P+o3v~WnG0jE89`+oJF;J-}>ew&%YAld@?`5 zq(?1vdDQ234fLO0RKr72D>KQa&p_?MT@4?PV*}3_76(JPaonv-;GhnMX()K zMxB9WsP?z<_uu@d`Z%hChqk~w)PUl+rh)R-`k00Ec31>QqdMM>dO9AV9_@gK^B^!;S_joYbJU)9Lp>dR zZ2B0~D>xE$Mow8Tp$2jbRsIF)hu#=5JiOp|{&EpeMibPYbVYSE47FrG+x*$q^{5#h zu=(dOCGi`mJ%5E7;0LQGrkPl5RC_5<6AHxKdj9hePycpnhZ-u;VO!gr`WPn?RS^6-rXwU-6> zA2>qX_8DH50Xjo2`dX zr~4x6sc_PH{O|HCsP{!})ZT`o>W@a9`h}==Hep6Qh$?>%H8D?mGmzAnNY8&30-AXd zn^D`^6t$%7Py^_X>R=XXt5&0Cau4;GJ;TfR5%n>AA%i(9_whgCo{Z*@zp=&*WQ+9t zXC$Bz7QlU27dv6XOy*74ANAOcM!gs2qh`L-#?PZ(T>ski7@0l(zqFbWwGvgZ6gER` zG z@1wS4at@EP99Q5{teexk$X=o*=FMf=orD@d@_76|j=x2{c*^AUI3IBqYAa^uGmq^FyhhwxFu%t+KpaX zox(8U^9p*LwV0@ohyN0mUp!)C;%^F@S8nYfkMk$-;ixxb=OX5N!yT+kybga^usP1f zvG@x0;WMO|$NzOc5_v^?onr*5knsd-U{G;$I)|c8`%2Uy`wb`Hbu5RSOL+X>a#vs> z;zdiE&;QP-L%IO9W$RI&2|KU_K13bn3Z)e1`3obUclrrb#v@e4w583`=Rh5*qNs)| zqL#h^>J2yuN8t?&#o#ig-bqyXYuFkeVI)>BYudk!ZS?#A6uam>|^I>4`escd$IZ#M)S-qR0PJ^$1k@v5GwZ zbqK_%WKL~!)MGanHS*=C=Y1<`$&aI+j+Ztbqq6z%$&ad65;dSoHeMU^6K{&zsxep$ z|HgS3SjB6Wc25g0Z);ClkgveTiY^6ZCi7x7fxD1@|$v(Bz+5Q%p^R)w6F8e*C-MO zl6lcqvw!cT7+$Q1fA&$AikY&fF0yK>rPv5Jo!pmL77PeDiP+f_g^|!|No-@ z+P3km6kI_A{cS-N8cXD_Ye#jO~Mk6Pc zn|LT?ir9f(p^a#St5c>oc{y+tcY4a~BJYsi|GE}&cOs)QrbS(Qx%muo7IE`yJO59+ zO4o}-S8E#FK)OC7782I=31gBLgL^Xfbm|7%_SO(?z}=C1Eq7d%)9+sjP%#UI^fCGE z6=)l6Nx_&@NJ;!B%uig`@5FiR9S`>-;&*L&9ZW!bM@VafdL>7hcxqFfxMcPFg)s>TYAZ^toyh?*29+&uj z!mX6Yt?M&&zL0jEu(v$_Dnmk7GV{>ra$AUGCz$wi@*0yijD}_q?nnAl(toq%3X%Sr z#(v;lM)>Qc?|&;OR}nvwSA=kH^2ZbYdIjXYLB|Yi48HDvNPiZ>| zA$);*9c8C67=HERoUx4$p>ApNvXJ%|-*P`AZ=fACQKuDUV(b6E)r5?SWTg0J^vhJj zUUMm^Z>v4X-$dDzwvlawyD-=w^8dxQsOud0eC7B5M+y4u_%C^*q$=9`n_#fPhi7&*PwvNf= z6Nmu6sPtcZD8sLH{h!g<^>-ll6PZa?HtuV5I*a>P+dv}HUK374XWIzp4)j;j&)Kl@S4CqF%9BunyE6@}wwWjG0FtRuuJ+$F zIDq(h@{f|XmGU15pW{wJxUQ`i-PZG0=3jHUTaoq&2Q$dr+zY8+o&NpTQd=Pf840*w z(O4Vqq1?JQ+J+U5L&cWF+mSbyvh6W3cH(YHcoO+JY`vtEo55Y5dRx#(o~|~O)#ZK9 zzqXQ?iUHI^?>8eqMjn6o;Qwx(fdAl@7j;atH>Rj^oh0;erxWu zrM=XY2_|hI;l4I+2X(^q|G-E?p`m2_#Qie`r<2i-G=7Kgzvhvine?yMeHs`^M1#){!3((;gh zk-{wr`?#O`D-z&(Ntu6$r=Uz7o31a5mx=58hy0l~J(NCt+$$JF1@1DW|Kzoq^KGY< zi5Dhw7V*1;ALDN{meS^{(Eu9xKzt*nvmGh@4src7a+1t2< za2xiPvkmVdVHBAW#BXu$;LgiHbPXn4-&Rok7!5Qd?d$ae@ukFzlQ4lhGxf%NGq51i z&fEIEDA$<0HPqqq@_!)W(Idp4^*T)nN8^6u&*P;|;q)}tlY0hfv<2CtDfj=Ltet}>*}r0xOydfgyCjXO7W`cZDN&G06r z!P<62mr1Ng<}2bkNiXrWHr}v}Pb0k|;X&L(Nl#(xuD4}#5&wsd7Etafjv;+10~u@U z^GERxKgRp7-?aZ#ZAJ)ACOH_ZaPtS!{wo>b=G@DPJ>f1+dS~tc(sYfZqv~{e(>6NV zT9mvkwv5Wgbxv}L%Bf0Kia;QQok(y=)VDTVsW1&Q`c5o@nFU|h}_ahR|Qur(t`w$*$3%s@~VoGx$31p(oaO{nFD3_Qr zqo~6#r~cp7l=wr^elQ%8#e* z`dF2`Fx$>GTQ5I(TwaGiMQ_TMxo7=Q^g)(y}Gl097zBTN!4b7pF zuCi1NC!N3j;XI+j65>IW*+e`!;lauyUYBq!((VwhjQm!~>4Un8lBa8~wJG6-)cbm! zrQOq%^*^;E2_)yPPXi~h6b1KU0CE3iE0!aznr*NdVO{UZ%fX$RcmbPs;cGqeD-h0V z>x`vbC2n=Dwdb1#<`CxB(vC~xC2aZt>}JCqXmA>JGIH1B zenY$fZOtWr4W^;(frJ|p*0l?Fb7!NR|4(j}xYA~prjrE}&WQ1-Se!yVi0`4yb;=AT zZ5H=o(mP^FOpL85bAbG1*hvj?B_gi`c`ml4y=thd6J@${`!6lUHJf3RoSbAHw2?H} z!iEpi!Fj^vX{W*D)W=KiEvum=yCFD&`w$MN`Eu452W8Etrcls zxT~4+Ugr*hog|c{p?6rEcsK4+G%|s-bKJTzlJ^Jq4<_n#CakMA4d=AsjHXei25u!! zf8=n8@Okdp#QV@z49fmOxCr4${p6mL$hX&zHWCM$*oOO2xGDphPlLJ!ayPOAi(}Ka zVPjih}O z`yTfr@^(`%46oQSY3yLqQ}&|`rzBj6GJkSkpuG1M8JW08aJS)ZPl1kPG++Sz3F{g{ zx~`7gA%ss*`8eSfbhLr+*J~VsX52qe_g}naGdfW&l(Z=7jEpSll9!S46)4-9I}c?>;S?;W%3OW%K51hKzaTw= z@VD0^()R1823>3ZPv$H-n9R)|;yAOFXB+*GwC;qTlm40Xzlkrld8uen*E7N%&VR zLfO)Uhp8dj_|tZl)pnpZCV$gbcfyg>iDt|FMK!0;HzOQN#Z}x%Dfl}L7b2XR{CZT1 zM`JbABG+u<|5BzgUd2}?+5hkFsh5DXc-%hjm9!Cyv{mFzQrp~JZJ)>W{15zQ05NH> zD|ZNm22a*Mxt@wAuW=;%cLFQZb4(C zD0821VbWJpW;XE_gdcG0D#zWIa#P65&Hd4)D{tc0=U{ki(fax5A55nE2lUC6Iayf%Kl1`r=bd>#o!ZP^;Ot>AxDYGNB6M|e0DA5zw1XOxb-+oZQ3z6C4WvT9-^@hRBarX{29 zZ``N2!%3@&{{M5wj|BdvU>+KNZwIoI$_)rtweiDvhPw_G|Kv_YcsB09W88~r<05VJ zV<5+WwC^5soLmkaTZX{xylaGYt$Su@<8pMuCMC z>_GYe;!_F7;C^U3&P4bUx2_@FnMuDzeO;q9Tk5e^jlUHigG_cCR-o3)Y9R)-D!H87H z=S1y0-Y|Mpjx#$0qTXK^>qeZu^k>x0%L_bF%dZXgL>0ZcG$6urFKI-&dzYd-_p5lK z+WuKOR@B4isokht{5g8m-T(RrM2&to*%OuheRJ+h|{ERNLXOUknrHH-TOvPE$bHaohs|jj_&JI+3gkGSF@(uK87zx1NVdLyVJ-` z=K2OVadW$ox0kjd zk1yGCcXD*!lUHuyXpuYKxto0aYimp&e~o!Wbl=*T9+vHBEDzJ`8`smv^-YNHxfeZh zW>U{KU)yA!bpgKesXcQ%zGrDYU8DIfXY@>s=IfosbJg`V%;qWU`jX`EEc5tI=JM1I z@MX{M+2Zj8hBF2@a=2n85q;Ip{?hh>+9U!Q_}U7>*#6eMkeg!i5dAI#FH_y zawkt3U%}3vt!`xUuAUZo?Me>r+ABCTFr;I@(5``<`wb578rUVcUq~qb4h!!W+AFYQ z*YJL&A_sQzlqwj=feP#z7983yERjs1KS6O2X^ciPN;j=_Wi>8 z1&8{&clDHTBNK&sI>hvs?G+rkDb$n0w>i`^(T&(VDb>u@Zv4oF;hxy>djV=7RH=ZEAnYyPaHRIqv15NFg%m4rY diff --git a/locale/eu_ES/LC_MESSAGES/django.po b/locale/eu_ES/LC_MESSAGES/django.po index 647483af8..1164c443a 100644 --- a/locale/eu_ES/LC_MESSAGES/django.po +++ b/locale/eu_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-02-11 15:47\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Basque\n" "Language: eu\n" @@ -54,19 +54,19 @@ msgstr "Pasahitzak ez datoz bat" msgid "Incorrect Password" msgstr "Pasahitz okerra" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Irakurketaren amaiera-data ezin da izan hasiera-data baino lehenagokoa." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Irakurketaren geldiera-data ezin da izan hasiera-data baino lehenagokoa." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Irakurketaren geldiera-data ezin da etorkizunekoa izan." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Irakurketaren amaiera-data ezin da etorkizunekoa izan." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Automatikoki sortutako txostena" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Zain" @@ -258,17 +259,24 @@ msgstr "Jarraitzaileak" msgid "Private" msgstr "Pribatua" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktiboa" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Osatuta" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Geldituta" @@ -284,6 +292,10 @@ msgstr "Errorea liburua kargatzean" msgid "Could not find a match for book" msgstr "Ezin izan da libururako parekorik aurkitu" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Huts egin du" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Dohainik" @@ -359,7 +371,7 @@ msgstr "Kritikak" msgid "Comments" msgstr "Iruzkinak" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Aipuak" @@ -461,7 +473,7 @@ msgstr "Svenska (suediera)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (ukrainera)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (Txinera tradizionala)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Ai ene!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Baimena ukatu da" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Ez duzu baimenik orri hau ikusteko edo ekintza hau burutzeko. Erabiltzailearen baimen maila %(level)s da." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Sarbidea eduki beharko zenukeela uste baduzu, hitz egin BookWyrm zerbitzariko administratzailearekin." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,19 @@ msgstr "Badirudi eskatu duzun orrialdea ez dela existitzen!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Fitxategi handiegia" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Igotzen ari zaren fitxategia handiegia da." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +" Fitxategi txikiago bat erabil dezakezu, bestela, eskatu BookWyrm zerbitzariko administratzaileari DATA_UPLOAD_MAX_MEMORY_SIZE ezarpenaren balioa handitzeko.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +978,7 @@ msgstr "Gorde" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +996,7 @@ msgstr "Datuak kargatzean %(source_name)s(e)ra konektatu eta he #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Berretsi" @@ -1480,9 +1496,12 @@ msgid "Domain" msgstr "Domeinua" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1513,8 @@ msgstr "Egoera" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -1763,7 +1783,7 @@ msgstr "%(username)s erabiltzaileak %(username)s started reading %(book_title)s" -msgstr ", %(username)s orain %(book_title)s irakurtzen hasi da" +msgstr "%(username)s erabiltzailea %(book_title)s irakurtzen hasi da" #: bookwyrm/templates/discover/card-header.html:23 #, python-format @@ -2547,7 +2567,7 @@ msgstr "Bara-kode irakurgailua" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Erabili Zerrendak, Arakatu eta Zure liburuak estekak irakurketa-gomendioak, zerbitzariko azken gertaerak eta katalogatutako liburuak ikusteko." #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,7 +2599,7 @@ msgstr "Jakinarazpenak" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Profila, erabiltzaile-direktorioa, mezu zuzenak eta ezarpenak hemengo menuko izenean sakatuz atzi daitezke." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2826,111 +2846,121 @@ msgid "No activities for this hashtag yet!" msgstr "Ez dago aktibitaterik oraindik traola honentzat!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Inportatu liburuak" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Inportatu liburu zerrenda" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "CSV fitxategia ez da baliozkoa" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Une honetan, %(display_size)s liburu inporta ditzakezu %(import_limit_reset)s egun bakoitzeko." msgstr[1] "Une honetan, %(display_size)s liburu inporta ditzakezu %(import_limit_reset)s egunero." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "%(display_left)s geratzen zaizkizu." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Batezbeste, azken aldiko inportazioek %(hours)s ordu hartu dituzte." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Batezbeste, azken aldiko inportazioek %(minutes)s minutu hartu dituzte." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Datu iturria:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Zure Goodreadseko datuak deskargatu ditzakezu zure Goodreads kontuko Inportatu/esportatu orrialdean." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Datu fitxategia:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Gehitu kritikak" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Inportatutako berrikuspenen pribatutasun ezarpena:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Inportatu" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Inportatu ditzakezun liburuen mugara heldu zara." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Inportazioak aldi baterako ezgaituta daude; eskerrik asko zure pazientziagatik." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Azken inportazioak" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Sortze-data" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Azken eguneratzea" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Elementuak" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Ez dago azken inportaziorik" @@ -2966,7 +2996,8 @@ msgid "Refresh" msgstr "Freskatu" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Gelditu inportazioa" @@ -3064,6 +3095,133 @@ msgstr "Inportazio honek formatu zaharra du, eta jada ez da bateragarria. Inport msgid "Update import" msgstr "Inportazioa eguneratu" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Inportatu BookWyrm kontua" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "Ez da baliozko inportazio fitxategia" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "Edozein egoera migratu nahi baduzu (iruzkinak, kritikak edo aipuak) kontu hau migrazioaren jatorri denaren alias gisa ezarri behar duzu, ala kontu hura honako honetara mugitu, zure erabiltzaile datuak inportatu aurretik." + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "Une honetan erabiltzaile bat inportatzeko baimena duzu %(user_import_hours)s orduro." + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "Berriz ere erabiltzaile fitxategi bat inportatu ahalko duzu %(next_available)s(e)tan" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "1. pausoa:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "Hautatu beste BookWyrm kontu batetik sortutako esportazio fitxategia. Fitxategiak .tar.gz formatua eduki behar du." + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "2. pausoa:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "Hautatu gabe utzi inportatu nahi ez dituzun datuen kutxatxoak." + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Erabiltzailearen profila" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "Erakusteko izena, laburpena eta irudia gainidazten ditu" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Erabiltzailearen ezarpenak" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "Gainidazten du:" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "Zure kontua jarraitzeko beste erabiltzaileak eskuz baimentzea behar den ala ez" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "Jarraitzaileak/jarraitzen dituzunak zure profilean ikusgarri egongo diren ala ez" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "Zure irakurketa helburua zure profilean ikusgarri egongo den ala ez" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "Jarraitzeko erabiltzaile gomendioak ikusten dituzun ala ez" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "Zure kontua besteei gomendatuko zaien ala ez" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Zure ordu-eremua" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "Zure bidalketen pribatutasun-ezarpen lehenetsia" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "Jarraitzaileak eta jarraituak" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Erabiltzaile blokeoak" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "Irakurketa-helburuak" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "Irakurketa-helburuak gainidazten ditu inportazio-fitxategian zerrendatutako urte guztietarako" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Apalak" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "Irakurketa-historia" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "Liburuen kritikak" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Liburuei buruzko iruzkinak" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Liburu-zerrendak" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Gordetako zerrendak" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3242,7 @@ msgid "Reject" msgstr "Ezetsi" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Huts egindako elementuak" @@ -3747,8 +3905,8 @@ msgstr "%(related_user)s(e)k \"invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Gonbidapen-eskaera berria erantzunaren zain" +msgstr[1] "%(display_count)s gonbidapen-eskaera berri erantzunaren zain" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4022,16 @@ msgstr "%(group_name)s(r)en izena aldatu du" msgid "has changed the description of %(group_name)s" msgstr "%(group_name)s(r)en deskribapena aldatu du" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "Zure erabiltzaile-esportazioa prest dago." + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "Zure erabiltzaile-inportazioa osatu da." + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Ezabatu jakinarazpenak" @@ -4107,7 +4275,7 @@ msgstr "Kendu ezizena" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Blokeatutako erabiltzaileak" @@ -4242,14 +4410,66 @@ msgstr "Lehenetsitako pribatutasuna bidalketentzat:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Apalen pribatutasunaren bila zabiltza? Zure apal bakoitzarentzat berariazko ikusgarritasun maila ezarri dezakezu. Zoaz Zure liburuak atalera, hautatu apal bat fitxa-barran eta klikatu \"Editatu apala\"." +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "Esportatu BookWyrm kontua" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "Esportazio-fitxategi bat sor dezakezu hemen. Honek zure datuak beste BookWyrm kontu batera migratzeko aukera emango dizu." + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "

    Zure fitxategiak honakoak izango ditu:

    • Erabiltzaile profila
    • Erabiltzaile ezarpen gehienak
    • Irakurketa-helburuak
    • Apalal
    • Irakurketa-historia
    • Liburuen kritikak
    • Egoerak
    • Zure zerrendak eta gordetako zerrendak
    • Jarraitzen dituzun eta blokeatu dituzun erabiltzaileak

    Zure fitxategiak ez ditu izango:

    • Mezu zuzenak
    • Zure egoerei erantzunak
    • Taldeak
    • Gogokoenak
    " + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "Zure BookWyrm kontu berrian hautatu ahal izango duzu zer inportatu: ez duzu esportatutako guztia inportatu beharko." + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "Edozein egoera migratu nahi baduzu (iruzkinak, kritikak edo aipuak) mugitzen ari zaren helburuko kontua honako honen alias gisa ezarri behar duzu, ala kontu hau kontu berrira mugitu, zure erabiltzaile datuak inportatu aurretik." + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "Esportazio fitxategi berdi bat sortu ahalko duzu %(next_available)s(e)tan" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "Sortu erabiltzaile esportazio fitxategia" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Azken esportazioak" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "Erabiltzaile-esportazio fitxategiek 'osatuta' adieraziko dute prest daudenean. Baliteke honek tartetxo bat hartzea. Klik egin estekan fitxategia deskargatzeko." + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Data" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "Tamaina" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "Deskargatu zure esportazioa" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Esportatu CSVra" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "Esportatu liburu zerrenda" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Esportazioak eduki guzti hauek hartuko ditu: zure apaletako liburu guztiak, kritikatu dituzun liburuak eta irakurketa-aktibitateren bat duten liburuak." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "Zure CSV esportazio-fitxategiak zure apaletako liburu guztiak, kritikatu dituzun liburuak, eta irakurketa-aktibitatea duten liburuak izango ditu.
    Erabili hau Goodreads bezalako zerbitzuetara inportatzeko." #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4487,7 @@ msgstr "Mugitu kontua" msgid "Data" msgstr "Datuak" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Esportatu CSVra" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Harremanak" @@ -4762,7 +4978,8 @@ msgid "Active Tasks" msgstr "Zeregin aktiboak" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "IDa" @@ -5156,9 +5373,14 @@ msgid "No instances found" msgstr "Ez da instantziarik aurkitu" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Gelditu inportazioa?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "Ekintza honek erabiltzaile-inportazioa etengo du osatu aurretik eta ezin da desegin" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Desgaitu inportazio berriak abiaraztea" @@ -5171,70 +5393,107 @@ msgstr "Erabiltzen da hori inportazioekin gauzak benetan gaizki doazenean eta ar msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Inportazioak desgaituta dauden bitartean, erabiltzaileek ezingo dituzte inportazio berriak hasi, baina dauden inportazioei ez die eragingo." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "Ezarpen honek liburu zein erabiltzaile inportazioak eragozten ditu." + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Desgaitu inportazioak" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Erabiltzaileek ezin dituzte inportazio berriak abiatu une honetan" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Gaitu inportatzea" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Mugatu inportazio kopurua" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Erabiltzaile batzuk liburu kopuru handi bat inportatzen saia daitezke, eta baliteke hau mugatu nahi izatea." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Ezarri 0 balioa inolako mugarik jarri nahi ez baduzu." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Ezarri inportatzeko mugua kopurua" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "liburutara, " -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "egunero." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Ezarri muga" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "Mugatu erabiltzaileek zein maiztasunekin inportatu eta esportatu dezaketen" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "Erabiltzaile batzuk erabiltzaile inportazioak edo esportazioak oso sarri egiten saia daitezke; agian mugaren bat ezarri nahi duzu." + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "Mugatu erabiltzaile inportazioak eta esportazioak: " + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "ordutik behin" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "Muga aldatu" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "Liburu inportazioak" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Osatuta" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Erabiltzailea" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Eguneraketa-data" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Zain dauden elementuak" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Elementu arrakastatsuak" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Ez da aurkitu bat datorren inportaziorik." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "Erabiltzaile inportazioak" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5721,7 +5980,7 @@ msgstr "Ezarri instantziaren lehenetsitako azala" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Zure gaietako bat hautsita dagoela dirudi. Gai hau hautatzean, aplikazioa erabilezina izango da." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5775,15 +6034,15 @@ msgstr "Ezabatu azala" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Probatu gaia" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Hautsitako gaia" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Kargatu da" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5832,7 +6091,7 @@ msgstr "Ezarri gabe" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Kontu hau HTTP eskaerak sinatzeko instantzia-aktorea da." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5904,15 +6163,15 @@ msgstr "Erabiltzailearen ekintzak" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Instantziako admin aktorea da hau" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Ez zenuke kontu hau ezabatu edo desgaitu behar zerbitzaria behar bezala ibiltzeko kritikoa delako. Aktore honek kanpora alderako GET eskaerak sinatzen ditu ActivityPub zerbitzari seguruekin interakzioa errazteko." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Kontu hau ezin dute erabiltzaile arruntek aurkitu eta ez dauka profil-orririk." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6047,17 +6306,15 @@ msgstr "Sortu apala" msgid "Edit Shelf" msgstr "Editatu apala" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Erabiltzailearen profila" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Liburu guztiak" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Inportatu liburuak" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6411,7 +6668,7 @@ msgstr "Jarraitu kontu berrian" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s mugitu egin da %(moved_to_name)s(e)ra" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format @@ -6624,22 +6881,22 @@ msgstr "(e)k %(book)s puntuatu du:" #: bookwyrm/templates/snippets/status/headers/read.html:10 #, python-format msgid "finished reading %(book)s by %(author_name)s" -msgstr "%(author_name)s egilearen %(book)s irakurtzen amaitu dut" +msgstr "(e)k %(author_name)s egilearen %(book)s irakurtzen amaitu du" #: bookwyrm/templates/snippets/status/headers/read.html:17 #, python-format msgid "finished reading %(book)s" -msgstr "%(book)s irakurtzen amaitu dut" +msgstr "(e)k %(book)s irakurtzen amaitu du" #: bookwyrm/templates/snippets/status/headers/reading.html:10 #, python-format msgid "started reading %(book)s by %(author_name)s" -msgstr ", %(author_name)s(r)en %(book)s irakurtzen hasi da" +msgstr "erabiltzailea %(author_name)s(r)en %(book)s irakurtzen hasi da" #: bookwyrm/templates/snippets/status/headers/reading.html:17 #, python-format msgid "started reading %(book)s" -msgstr ", %(book)s irakurtzen hasi da" +msgstr "erabiltzailea %(book)s irakurtzen hasi da" #: bookwyrm/templates/snippets/status/headers/review.html:8 #, python-format diff --git a/locale/fi_FI/LC_MESSAGES/django.mo b/locale/fi_FI/LC_MESSAGES/django.mo index f0c7a156cd19ae35c065017b278a1e0b0311454e..117e30e7aef0c70c51a4069696797b7423e8e095 100644 GIT binary patch delta 32103 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 diff --git a/locale/fi_FI/LC_MESSAGES/django.po b/locale/fi_FI/LC_MESSAGES/django.po index df42e2b4c..140f6f92e 100644 --- a/locale/fi_FI/LC_MESSAGES/django.po +++ b/locale/fi_FI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-02-14 22:33\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -54,19 +54,19 @@ msgstr "Salasanat eivät täsmää" msgid "Incorrect Password" msgstr "Virheellinen salasana" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Lopetuspäivä ei voi olla ennen aloituspäivää." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Keskeytyspäivä ei voi olla ennen aloituspäivää." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Keskeytyspäivä ei voi olla tulevaisuudessa." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Lukemisen lopetuspäivä ei voi olla tulevaisuudessa." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Automaattisesti luotu raportti" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Odottaa" @@ -258,17 +259,24 @@ msgstr "Seuraajat" msgid "Private" msgstr "Yksityinen" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktiivinen" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Valmis" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Keskeytetty" @@ -284,6 +292,10 @@ msgstr "Virhe kirjan lataamisessa" msgid "Could not find a match for book" msgstr "Kirjaa ei lÃļytynyt tietokannoista" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Ei onnistunut" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Ilmainen" @@ -359,7 +371,7 @@ msgstr "Arviot" msgid "Comments" msgstr "Kommentit" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Lainaukset" @@ -461,7 +473,7 @@ msgstr "Svenska (ruotsi)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (ukraina)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (perinteinen kiina)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Voi ei!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Pääsy kielletty" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Sinulla ei ole oikeutta nähdä tätä sivua tai suorittaa toimintoa. KäyttÃļoikeustasosi on %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Jos sinulla mielestäsi pitäisi olla oikeus tähän, ota yhteyttä palvelimen ylläpitäjään." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,18 @@ msgstr "Pyytämääsi sivua ei ole olemassa." #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Liian suuri tiedosto" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Lähettämäsi tiedosto on liian suuri." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +"Voit yrittää pienemmällä tiedostolla tai pyytää palvelimen ylläpitäjää kasvattamaan DATA_UPLOAD_MAX_MEMORY_SIZE-aetusta. " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +977,7 @@ msgstr "Tallenna" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +995,7 @@ msgstr "Tietoja ladattaessa muodostetaan yhteys lähteeseen %(source_nam #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Vahvista" @@ -1403,7 +1418,7 @@ msgstr "Kirjan %(book_title)s laitokset" #: bookwyrm/templates/book/editions/editions.html:8 #, python-format msgid "Editions of %(work_title)s" -msgstr "" +msgstr "Teoksen %(work_title)s laitokset" #: bookwyrm/templates/book/editions/editions.html:55 msgid "Can't find the edition you're looking for?" @@ -1480,9 +1495,12 @@ msgid "Domain" msgstr "Verkkotunnus" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1512,8 @@ msgstr "Tila" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2826,111 +2845,121 @@ msgid "No activities for this hashtag yet!" msgstr "Tätä aihetunnistetta ei ole vielä käytetty!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Tuo kirjoja" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Epäkelpo CSV-tiedosto" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "Voit käyttää toimintoa vielä %(display_left)s kertaa." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Viime aikoina tuonteihin on kulunut keskimäärin %(hours)s tuntia." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Viime aikoina tuonteihin on kulunut keskimäärin %(minutes)s minuuttia." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Tietolähde:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Goodreads-tiedot voi ladata Goodreads-käyttäjätilin Import/Export-sivun kautta." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Datatiedosto:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "MyÃļs arviot" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Tuotavien arvioiden yksityisyysvalinta:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Tuo" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Olet käyttänyt tuontitoimintoa sallitun määrän." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Tuonti on väliaikaisesti pois käytÃļstä; palaa asiaan myÃļhemmin." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Viimeksi tuotu" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Luontipäivä" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Päivitetty viimeksi" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Nimikkeitä" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Ei viimeaikaisia tuonteja" @@ -2966,7 +2995,8 @@ msgid "Refresh" msgstr "Päivitä" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Keskeytä tuonti" @@ -3064,6 +3094,133 @@ msgstr "Tuonti on vanhassa muodossa, jota ei enää tueta. Jos haluat selvittä msgid "Update import" msgstr "Päivitä tuonti" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Käyttäjäprofiili" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3241,7 @@ msgid "Reject" msgstr "Hylkää" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Epäonnistuneita nimikkeitä" @@ -3864,6 +4021,16 @@ msgstr "on muuttanut ryhmän %(group_name)s nime msgid "has changed the description of %(group_name)s" msgstr "on muuttanut ryhmän %(group_name)s kuvausta" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Poista ilmoitukset" @@ -4107,7 +4274,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Estetyt käyttäjät" @@ -4242,14 +4409,66 @@ msgstr "Julkaisujen julkisuuden oletusvalinta:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Haluatko pitää hyllysi yksityisenä? Voit asettaa kunkin hyllyn näkyvyyden erikseen. Siirry Omiin kirjoihin, valitse välilehdeltä haluamasi hylly ja napsauta ”Muokkaa hyllyä”." +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSV-vienti" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Vienti sisältää kaikki hyllyissäsi olevat ja arvioimasi kirjat sekä kirjat, joita olet lukenut." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4486,7 @@ msgstr "" msgid "Data" msgstr "Tiedot" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV-vienti" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Suhteet" @@ -4761,7 +4976,8 @@ msgid "Active Tasks" msgstr "Aktiiviset tehtävät" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "Tunniste" @@ -5155,9 +5371,14 @@ msgid "No instances found" msgstr "Palvelimia ei lÃļytynyt" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "KeskeytetäänkÃļ tuonti?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Poista tuontien aloittaminen käytÃļstä" @@ -5170,70 +5391,107 @@ msgstr "Käytä tätä vain, kun tuonnit eivät kertakaikkiaan onnistu ja haluat msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Kun tuonnit on poistettu käytÃļstä, käyttäjät eivät voi aloittaa uusia tuonteja, mutta tällä ei ole vaikutusta käynnissä oleviin tuonteihin." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Poista tuonti käytÃļstä" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Käyttäjät eivät voi aloittaa uusia tuonteja" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Ota tuonti käyttÃļÃļn" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Rajoita tuontien määrää" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Joskus käyttäjät voivat yrittää tuoda suuria määriä kirjoja, ja voit halutessasi rajoittaa tätä." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Poista kaikki rajoitukset asettamalla arvoksi 0." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Aseta tuontirajaksi" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "kirjaa joka" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "päivä." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Ota rajoitus käyttÃļÃļn" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Valmis" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Käyttäjä" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Päivitetty" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Odottavia nimikkeitä" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Onnistuneita nimikkeitä" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Ei ehtoihin sopivia tuonteja." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6046,17 +6304,15 @@ msgstr "Luo hylly" msgid "Edit Shelf" msgstr "Muokkaa hyllyä" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Käyttäjäprofiili" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Kaikki kirjat" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Tuo kirjoja" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 1b3148f925749c58c5c0af8d9a502d676311710c..4cdcbf8ea2a3ffdeed740317a055f435e5954b7c 100644 GIT binary patch literal 44850 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 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 8fa5f634e..c69847369 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:11\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-02-19 03:19\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -54,19 +54,19 @@ msgstr "Le mot de passe ne correspond pas" msgid "Incorrect Password" msgstr "Mot de passe incorrect" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "La date de fin de lecture ne peut pas ÃĒtre antÊrieure à la date de dÊbut." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "La date d’arrÃĒt de lecture ne peut pas ÃĒtre antÊrieure à la date de dÊbut." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "La date d’arrÃĒt de lecture ne peut pas ÃĒtre dans le futur." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "La date de fin de lecture ne peut pas ÃĒtre dans le futur." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Rapport gÊnÊrÊ automatiquement" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "En attente" @@ -258,17 +259,24 @@ msgstr "AbonnÊ(e)s" msgid "Private" msgstr "PrivÊ" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Actif" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "TerminÊ" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Interrompu" @@ -284,6 +292,10 @@ msgstr "Erreur lors du chargement du livre" msgid "Could not find a match for book" msgstr "Impossible de trouver une correspondance pour le livre" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Échec" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratuit" @@ -359,7 +371,7 @@ msgstr "Critiques" msgid "Comments" msgstr "Commentaires" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citations" @@ -461,7 +473,7 @@ msgstr "Svenska (SuÊdois)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainien)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (chinois traditionnel)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Oh non !" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,7 +494,7 @@ msgstr "Autorisation refusÊe" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Vous ne disposez pas des droits d'accès pour accÊder à cette page ou pour toute action. Votre niveau d'accès est :%(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." @@ -498,7 +510,7 @@ msgstr "Il semblerait que la page que vous avez demandÊe n’existe pas !" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Fichier trop volumineux" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." @@ -964,6 +976,7 @@ msgstr "Enregistrer" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +994,7 @@ msgstr "Le chargement des donnÊes se connectera à %(source_name)sImport/Export page of your Goodreads account." msgstr "Vous pouvez tÊlÊcharger vos donnÊes Goodreads depuis la page Import/Export de votre compte Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Fichier de donnÊes :" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Importer les critiques" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "ConfidentialitÊ des critiques importÊes :" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importer" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Vous avez atteint la limite d’imports." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Les importations sont temporairement dÊsactivÊes, merci pour votre patience." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Importations rÊcentes" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Date de CrÊation" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Dernière Mise à jour" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "ÉlÊments" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Aucune importation rÊcente" @@ -2966,7 +2994,8 @@ msgid "Refresh" msgstr "Actualiser" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "ArrÃĒter l'import" @@ -3064,6 +3093,133 @@ msgstr "Cette importation est dans un ancien format qui n'est plus pris en charg msgid "Update import" msgstr "Mettre à jour l'importation" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Étape 1 :" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Étape 2 :" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Profil utilisateur¡rice" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Paramètres utilisateur" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Votre fuseau horaire" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Bloc utilisateur" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Commentaire sur les livres" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Listes des livres" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Listes enregistrÊes" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3240,7 @@ msgid "Reject" msgstr "Rejeter" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "ÉlÊments dont l'importation a ÊchouÊ" @@ -3747,8 +3903,8 @@ msgstr "%(related_user)s vous a invitÊ à #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nouveau soumission requÃĒte attente de la rÊponse" +msgstr[1] "%(display_count)s nouveau soumission de plusieurs requÃĒtes attente de la rÊponse" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4020,16 @@ msgstr "a changÊ le nom du groupe %(group_name)s msgid "has changed the description of %(group_name)s" msgstr "a changÊ la description du groupe %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Supprimer les notifications" @@ -4107,7 +4273,7 @@ msgstr "Supprimer l'alias de redirection" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Comptes bloquÊs" @@ -4242,14 +4408,66 @@ msgstr "Niveau de confidentialitÊ des messages par dÊfaut :" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Vous souhaitez protÊger vos Êtagères ? Vous pouvez dÊfinir un niveau de visibilitÊ diffÊrent pour chacune d’elles. Allez dans Vos Livres, choisissez une Êtagère parmi les onglets, puis cliquez sur ÂĢ Modifier l’Êtagère Âģ." +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "CrÊer un fichier d'exportation" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Fichiers rÊcents" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Date" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "Taille" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "TÊlÊcharger vos rÊsultats" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Export CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "Exporter la liste des livres" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Votre export comprendra tous les livres sur vos Êtagères, les livres que vous avez critiquÊs, et les livres ayant une activitÊ de lecture." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4485,7 @@ msgstr "Migrer le compte" msgid "Data" msgstr "DonnÊes" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Export CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relations" @@ -4762,7 +4976,8 @@ msgid "Active Tasks" msgstr "TÃĸches actives" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5156,9 +5371,14 @@ msgid "No instances found" msgstr "Aucune instance trouvÊe" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "ArrÃĒter l'import ?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "DÊsactiver le lancement de nouvelles importations" @@ -5171,70 +5391,107 @@ msgstr "Ceci n'est destinÊ à ÃĒtre utilisÊ que lorsque la situation des impor msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Tant que les importations seront dÊsactivÊes, les utilisateur⋅ices ne pourront pas en commencer de nouvelles, mais celles existantes ne seront pas affectÊes." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "DÊsactiver les importations" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Les utilisateurs ne peuvent pas commencer de nouvelles importations" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Activer les importations" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Limiter le nombre d'imports" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Certains utilisateurs peuvent essayer d'importer un grand nombre de livres, ce que vous souhaitez limiter." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Mettez la valeur à 0 pour ne pas imposer de limiter." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "DÊfinir la limite d'import à" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "livres tous les" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "jours." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "DÊfinir la limite" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "heures" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "Importer le livre" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "TerminÊ" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Utilisateur" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Date de Mise à jour" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "ÉlÊments en attente" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "ÉlÊments rÊussis" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Aucun import correspondant trouvÊ." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "Importation des utilisateurs" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5775,11 +6032,11 @@ msgstr "Supprimer le thème" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Essai thème" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Thème Broken" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" @@ -5912,7 +6169,7 @@ msgstr "" #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Ce compte n'est pas visible par les utilisateurs ordinaires et n'a pas de page de profil." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6047,17 +6304,15 @@ msgstr "CrÊer une Êtagère" msgid "Edit Shelf" msgstr "Modifier l’Êtagère" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Profil utilisateur¡rice" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Tous les livres" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importer des livres" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6411,7 +6666,7 @@ msgstr "Suivre le nouveau compte" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s sont dÊplacÊs vers %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index 132cd95847f5dd8137eccc9e0ed3bd1f5f67dd33..0ac268fcc2150d1ef5664cd1e80f684512da8693 100644 GIT binary patch delta 42651 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 V+(y0eA6IfWkuHuGvi=?S_#Y)eauxsp delta 32155 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\n" "Language-Team: Galician\n" "Language: gl\n" @@ -54,19 +54,19 @@ msgstr "O contrasinal non concorda" msgid "Incorrect Password" msgstr "Contrasinal incorrecto" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "A data final da lectura non pode ser anterior ÃĄ de inicio." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "A data do abandono da lectura non pode ser anterior ÃĄ de inicio." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "A data de abandono da lectura non pode estar no futuro." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "A data de fin da lectura non pode ser futura." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Denuncia creada automÃĄticamente" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Pendente" @@ -258,17 +259,24 @@ msgstr "Seguidoras" msgid "Private" msgstr "Privado" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Activa" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Completa" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Detida" @@ -284,6 +292,10 @@ msgstr "Erro ao cargar o libro" msgid "Could not find a match for book" msgstr "Non se atopan coincidencias para o libro" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Fallou" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratuíto" @@ -359,7 +371,7 @@ msgstr "RecensiÃŗns" msgid "Comments" msgstr "Comentarios" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citas" @@ -461,7 +473,7 @@ msgstr "Svenska (Sueco)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ucraíno)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (ChinÊs tradicional)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Vaites!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Permiso denegado" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Non tes permiso para ver esta pÃĄxiina ou realizar esta acciÃŗn. O teu nivel de permisos Ê %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Se cres que deberías ter acceso, por favor contacta coa administraciÃŗn deste servidor BookWyrm." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,18 @@ msgstr "Parece que non existe a pÃĄxina solicitada!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Ficheiro demasiado grande" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "O ficheiro que estÃĄs a subir Ê demasiado grande." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +"Podes intentalo usando un ficheiro mÃĄis pequeno, ou pedir ÃĄ administraciÃŗn do teu BookWyrm que aumente o axuste DATA_UPLOAD_MAX_MEMORY_SIZE. " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +977,7 @@ msgstr "Gardar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +995,7 @@ msgstr "Ao cargar os datos vas conectar con %(source_name)s e c #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmar" @@ -1480,9 +1495,12 @@ msgid "Domain" msgstr "Dominio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1512,8 @@ msgstr "Estado" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -1558,7 +1577,7 @@ msgstr "%(pages)s pÃĄxinas" #: bookwyrm/templates/book/publisher_info.html:38 #, python-format msgid "%(languages)s language" -msgstr "idioma %(languages)s" +msgstr "Idioma %(languages)s" #: bookwyrm/templates/book/publisher_info.html:63 #, python-format @@ -2547,7 +2566,7 @@ msgstr "Lector de cÃŗdigos de barras" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Usa as ligazÃŗns Listas, Descubrir e Os teus libros para ter suxestiÃŗns de lecturas e ver o que acontece neste servidor, ou para ver os libros do teu catÃĄlogo!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,7 +2598,7 @@ msgstr "NotificaciÃŗns" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Podes acceder ao teu perfil, directorio de usuaria, mensaxes directas e axustes premendo no teu nome neste menÃē." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2826,111 +2845,121 @@ msgid "No activities for this hashtag yet!" msgstr "Aínda non hai actividade para este cancelo!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importar libros" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Importar Lista de Libros" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Non Ê un ficheiro CSV vÃĄlido" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Actualmente podes importar %(display_size)s libros cada %(import_limit_reset)s día." msgstr[1] "Actualmente podes importar %(display_size)s libros cada %(import_limit_reset)s días." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "Aínda podes importar %(display_left)s libros." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "De media, ÃĄs importaciÃŗns recentes levoulles %(hours)s horas." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "De media, ÃĄs importaciÃŗns recentes levoulles %(minutes)s minutos." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Fonte de datos:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Podes descargar os teus datos de Goodreads desde a pÃĄxina de ExportaciÃŗn/ImportaciÃŗn da tÃēa conta Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Ficheiro de datos:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Incluír recensiÃŗns" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Axuste de privacidade para recensiÃŗns importadas:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Acadaches o límite de importaciÃŗns." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "As importaciÃŗns estÃĄn temporalmente desactivadas; grazas pola paciencia." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "ImportaciÃŗns recentes" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Data de creaciÃŗn" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Última actualizaciÃŗn" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Elementos" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Sen importaciÃŗns recentes" @@ -2966,7 +2995,8 @@ msgid "Refresh" msgstr "Actualizar" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Deter a importaciÃŗn" @@ -3064,6 +3094,133 @@ msgstr "Esta importaciÃŗn ten un formato antigo xa non soportado. Se queres inte msgid "Update import" msgstr "Actualizar importaciÃŗn" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Importar Conta BookWyrm" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "Non Ê un ficheiro vÃĄlido de importaciÃŗn" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "Se queres migrar estados (comentarios, recensiÃŗns ou citas) debes ou ben configurar esta conta como un alias da conta da que estÃĄs migrando, ou mover esa conta a esta, antes de importar os teus datos como usuaria." + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "Actualmente podes importar unha usuaria cada %(user_import_hours)s horas." + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "PoderÃĄs volver a importar un ficheiro de usuaria en %(next_available)s" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Paso 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "Escolle un ficheiro de exportaciÃŗn creado noutra conta BookWyrm. O formato do ficheiro ten que ser .tar.gz." + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Paso 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "Desmarca calquera opciÃŗn dos datos que non queiras incluír ao facer a importaciÃŗn." + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Perfil da usuaria" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "Sobrescribir nome pÃēblico, resumo e avatar" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Axustes de usuaria" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "Sobrescribe:" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "Se Ê requerida a aprobaciÃŗn manual das solicitudes de seguimento" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "Se se mostran no teu perfil os seguimentos/seguidoras" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "Se se mostra o teu obxectivo de lectura no perfil" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "Se se mostrarÃĄn suxestiÃŗns de seguimento" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "Se a tÃēa conta serÃĄ suxerida a outras persoas" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "A tÃēa zona horaria" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "Os axustes de privacidade por defecto para as publicaciÃŗns" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "Seguidoras e seguimentos" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Bloqueos de usuarias" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "Obxectivos de lectura" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "Sobrescribe os obxectivos de lectura para todos os anos incluídos no ficheiro de importaciÃŗn" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Estantes" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "Historial de lectura" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "RecensiÃŗns de libros" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Comentarios sobre libros" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Listas de libros" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Listas gardadas" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3241,7 @@ msgid "Reject" msgstr "Rexeitar" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Elementos fallidos" @@ -3747,8 +3904,8 @@ msgstr "%(related_user)s convidoute a unir #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nova solicitude de convite agardando resposta" +msgstr[1] "%(display_count)s novas solicitudes de convite agardando resposta" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4021,16 @@ msgstr "cambiou o nome a %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "cambiou a descriciÃŗn de %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "Xa estÃĄ lista a exportaciÃŗn de usuaria." + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "Completouse a importaciÃŗn da usuaria." + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Eliminar notificaciÃŗns" @@ -4107,7 +4274,7 @@ msgstr "Eliminar alcume" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Usuarias bloqueadas" @@ -4242,14 +4409,66 @@ msgstr "Privacidade por defecto:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Queres privacidade para os estantes? Podes establecer individualmente o nivel de privacidade dos estantes. Vai a Os teus libros, elixe un estante das secciÃŗns, e preme en \"Editar estante\"" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "Exportar Conta BookWyrm" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "Podes crear aquí o ficheiro de exportaciÃŗn. Con este ficheiro podes migrar os teus datos a outra conta BookWyrm." + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "

    O ficheiro incluirÃĄ:

    • Perfil de usuaria
    • Moitos dos axustes de usuaria
    • Obxectivos de lectura
    • Estantes
    • Historial de lectura
    • RecensiÃŗns de libros
    • Estados
    • As tÃēas listas e listas gardadas
    • As usuarias que segues e bloqueas

    O ficheiro non incluirÃĄ:

    • Mensaxes directas
    • Respostas aos teus estados
    • Grupos
    • Favoritos
    " + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "Na tÃēa nova conta BookWyrm podes elexir o que importar: non tes que importar todos os elementos exportados." + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "Se desexas migrar todos os estados (comentarios, recensiÃŗns ou citas) tes que ou ben establecer a conta que estas a mover como un alias de esta, ou ben mover esta conta ÃĄ nova conta, antes de importar os teus datos de usuaria." + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "PoderÃĄs crear un novo ficheiro de exportaciÃŗn en %(next_available)s" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "Crear ficheiro de exportaciÃŗn de usuaria" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "ExportaciÃŗns recentes" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "Os ficheiros de exportaciÃŗn mostrarÃĄ 'completo' cando estean preparados. Podería levarlle un anaco. Preme na ligazÃŗn para descargar o ficheiro." + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Data" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "TamaÃąo" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "Descarga a exportaciÃŗn" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "ExportaciÃŗn CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "Exportar Lista de Libros" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "A exportaciÃŗn incluirÃĄ todos os libros dos estantes, libros que recensionaches e libros con actividade lectora." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "O ficheiro CSV de exportaciÃŗn incluirÃĄ todos os libros dos teus estantes, libros que recensionaches e libros con actividade lectora.
    Úsao para importalo en servizos como Goodreads." #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4486,7 @@ msgstr "Migrar Conta" msgid "Data" msgstr "Datos" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Exportar CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "RelaciÃŗns" @@ -4705,7 +4920,7 @@ msgstr "Colas" #: bookwyrm/templates/settings/celery.html:26 msgid "Streams" -msgstr "" +msgstr "TransmisiÃŗns" #: bookwyrm/templates/settings/celery.html:32 msgid "Broadcast" @@ -4763,7 +4978,8 @@ msgid "Active Tasks" msgstr "Tarefas activas" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5157,9 +5373,14 @@ msgid "No instances found" msgstr "Non hai instancias" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Deter a importaciÃŗn?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "Esta acciÃŗn deterÃĄ a importaciÃŗn antes de estar completa e non se pode desfacer" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Desactivar realizar novas importaciÃŗns" @@ -5172,70 +5393,107 @@ msgstr "Isto pretende ser Ãētil cando algo funciona realmente mal coas importaci msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Cando estÃĄn desactivadas as importaciÃŗns as usuarias non poderÃĄn realizar novas importaciÃŗns, pero as existentes non se verÃĄn afectadas." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "Este axuste evita poder importar libros e usuarias." + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Desactivar importaciÃŗns" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "As usuarias actualmente non poden realizar importaciÃŗns" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Activar importaciÃŗns" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Limitar o nÃēmero de importaciÃŗns" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Algunhas usuarias poderían querer importar un nÃēmero enorme de libros, podes poÃąerlle límite." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Establece un valor de 0 para non poÃąer un límite." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Establece un límite de" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "libros cada" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "días." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Establecer" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "Limitar a frecuencia con que se pode importar e exportar" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "Algunhas usuarias poderían intentar importar ou exportar usuarias con moita frecuencia, poderías querer limitalas." + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "Permitir importaciÃŗn e exportaciÃŗn de usuarias a unha vez cada " + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "horas" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "Cambiar límite" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "ImportaciÃŗn de libros" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Completada" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Usuaria" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Data de actualizaciÃŗn" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Elementos pendentes" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Elementos correctos" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Non se atopan importaciÃŗns que concorden." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "ImportaciÃŗn de usuarias" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5722,7 +5980,7 @@ msgstr "Establecer decorado por defecto para a instancia" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Un dos teus decorados semella estar estragado. Se escolles ese decorado tamÊn estragarÃĄs a aplicaciÃŗn." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5776,15 +6034,15 @@ msgstr "Eliminar decorado" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Probar decorado" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Decorado estragado" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Cargado correctamente" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5833,7 +6091,7 @@ msgstr "Non establecido" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Esta conta Ê o actor da instancia que asina as solicitudes HTTP." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5905,15 +6163,15 @@ msgstr "AcciÃŗns da usuaria" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Este Ê o actor administrador da instancia" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Non debes borrar ou desactivar esta conta xa que Ê crítica para o funcionamento do servidor. Este actor asina as solicitudes GET saíntes para unha interacciÃŗn fluída con servidores ActivityPub seguros." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Esta conta non Ê descubrible polas usuarias comÃēns e non ten pÃĄxina de perfil." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6048,17 +6306,15 @@ msgstr "Crear estante" msgid "Edit Shelf" msgstr "Editar estante" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Perfil da usuaria" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Todos os libros" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importar libros" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6412,7 +6668,7 @@ msgstr "Seguir na nova conta" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s migrou a %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format diff --git a/locale/it_IT/LC_MESSAGES/django.mo b/locale/it_IT/LC_MESSAGES/django.mo index 77a2bcec93637a599b10a9924ed8bd5183a0b66e..5a1ee0a733875c23ab0fa25d85a957d7282a0886 100644 GIT binary patch delta 44590 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 SJlE)~$y}p7kzSm&EB^tc{R?*h delta 31890 zcmZA91$Y$a0`BpdO@aj{xFtw%cXx`rdw}3h&_WlN;+mGy0tE^bC%|GYrAV>j#oe7! z-0%P0@8e$Xndh1F``l-C6Vmhdg}C>g#_?WG8aT({niJ$W>2ObO$LSy2ae6dYs^b(N z7W{z8G1FkjNsq;`CN{x}_%oKqTbLI!4IvNfV_V1ZI?DXBT$0t}1^AG37k(d!TU?Mz$ zDe2$2P9T(ox7YyFe&aad*b7VJ9IS;WFePTBPD$5sieU)xej^-b3yw$Smmg_Xq8TeT;E2-Wb+DF@X>Q-7qVX=S;`UN+0VuOR%{05-uh_YMkRt!0_=5 z64&A*EJ5Nj%tm4w4+BN*_5DeXvmPr;EeWHK#hxG<=C&aU78a_%E)& z>C=rRXE@Gs;x};$PMPUAe_+~Kj&Q{_LINCp9{JD<9`Eyp{8q5-Hw(Mjy z>#x0={GH?Yu*&z2Gao;oR$|^fV}>7?HSwRZGiIew1)PEd@hFbKsy}kj@Gon1dRO`( zjKo^ZibZiYSW9~snx))_J;|uM$Z_i6Z}OwpLH+GlJ3KHqzC=tI32MQw!lN! z9K%`vRyYFl;w9{W@maPA?1Opm1SUbR)^`Abq{yT1Oh6s3O{g<*A49P*`;^6Hw%C;T z4{T&He1?@U*DA*uioH<-xsTz;hTI@7VYgRJji}J#d{V7ax_L2IFf;VFa`kd2NC6sD|pG zI%t9c*cP*52TY0+Q3INf@o*i+$L*+k`!Oya$3%Dm6XFA#{}z*LNdnfJH&bd5*2D9Oxr~%!_V0?z!qEF~mh2|SfMh8qnyf>=C zNGyQgqLyq2roi2(j?bf3>H%u2o}mWz1~uSVF=il1P~}2V?PkZESRjV=*V48kK?7-L z?S@*iC{%-EFdxo94QLk@#Am2CW%x$3C8eAEYtutq3Yd5&G02^h97Yb#^$A>f&7TCuskmt z#^e;=Y9{>1OF(<_3e`}+Hj|MAHITHJ6f>drvVWQQ>n)lWW5q36Fa0gb38Cc{>!!_x;f!mm+hV=9)!?@*`rB&y*&zwx@o(x?Fi z{%+Fap$3o|i(@WSen-@RyZPhn{~!YDU^uGd@z$BBnf!=4tt(MWdm6Ph4^bUFLzN5K zX-tM%xiIXB1yFCw1*n0X!MT|D55BN?T|P1i=yYG$WkweKr)ek^YNX+~0SlpCwYRYi z=G^W73gt{ht<*i#O1?+UG{GJ-&}66qr9tKAMCF%4uVzw#fcCB$>h#vLHpfun?NKuv zjasQ0Hvb2kzQm?)K((_2wK98b{%O!zMoqYM=#BTUrkFVrz;TSRYJ6|ITOv z>Ua)n>DHqvZpBFa3*%v)zfHr%QRS*&9ITDnk|wCL(HS+6o~Y-2IBKakTmL`}{2+$W zzjK;^D!j&Y80U!jPL~zc(FjyW6EF;CU;>Om)!T(Ccig6*Lk;K->I}WM>4lD(@)b}M zu8;obzbAqCBt)Sa8i{%=C!#u9f(da0YHxR;wrn5ja9u>r=rO9Dx2PG%K4wgUTEVn7 z9*!!P{}}79j54-BHETm_8(Xj|CZgOxn?4TJ;SAJ3f5bAl1+@h)QRUyGo{sp(%>+WN z`7kl*WskG|nqgfMbjVtxwxA>Gu#7~_d>-n>v;wsie^?J#PoQRe!NzZ)R`M~X$CsE3 zLr$1ic6n?{e4&?s_VhI-#WW|)Y0iVGiC07otQ9K118V69qGm7|wGuy~X1oHw$E~OV zG(2T&iJC|U)YA9E5cGNplp-)2RpA(F3D2TtdKopdJD3cgT7&*EXCXCe3p1eJkU4C; zI;wsnRJ*NF^&?RO9)b+S>x?C!6_|-?Xd`OIJ5kT=J`Bans2O}hHJtFYS%H+8oOpKB zR+dGzQw!BjQ&h)oP)ptqv*1At(ewX=fR--sjA^5}UpbHNc&ydjFu>yM;;h{68X~$I3ZtW)_6%C?RS9p{NE5qh?kEr(t8% z8MuX-`AgKy0?(O_a-arQ0#&aX4#b977!RUX6+aQso+mhO4p}nP48pAi(Z94|{SAHeCD@TzHl0j4DWi;e$o-RmWwr96y!E-#^$ z`aY(>*Qm3Q=$e^X7^Wqj$66hAs3K8&J;0`qK@DUfY6Whg4&7rci!V_t;4O09ENwa5 zM?wwM5+=D}DyBy*bvUY{5~#yi-KMuib==R!N1_hxY}CM)qb9NqHL>HU@>fj0*LiFc zoSUZMM5qm>E~0&e}25gkEEiHaGZ| znQ0OXBqI%~!;IEEsE$gZma+z_qlQ=+JD>)(9Cb)HpjPlV)RrDVt;A_my}KBOuQ4wD zJ85p4f?2Q*@dB6;N1*n4A!-0SPz@hKtqP8FcHNnBC zc7~%@9Za+tOHm{K71yE5Q5Y^C-2WI46RELu=7S2P>a1m<2TQD}B zLDjp0!FbEYpW+VUuO6`e8tKM|W<gXD({zufI3w+A!9OI(;DTqwO>y#sqgoFr8g#A&^>uA)BmZARzg6jAJ_{mli~r)py&UhO?Zb|+Jw){0P>>-)Cjew9We=d zF(1xAt<)}?e#m+Wb=aO@D856Tg>=tN`QoT}Ma-b*zYPI3JlqzTh9ShiM;)#;sHNPD zI_*19OT8QQI3CBwnCpdE+L7oXJ{47O1{TF=EQv=@D;D=9lj%kvDS^H?9M$0y)XZL? z3c9b%?}FoDUg85#4KG3M?XQ>$*P2M6JXH>pj#~y+V~w`o1>aP^Y_ywIUWIUKc}f6l&nns0lCd z+JxmcVV#X{MK!z&HLzot6|dU-Sno_j2{AS4DNqgON6oYZYM?c(jZrghi#nX0Fe!Tb z5y(PdET+X@Q626>J>REM6|SKge1vM~mCgT%TB*42O?o2Kj6;NlT2C9Bt zWF@>#69PIMZBR4rjivA#)Cjj(|3)=%6}7~-FhBl>c`@?`vjq)M?X<%b*c%JrIMn-M z3#$HYOsMDo83E1M^U*A6QdEI7)@-OHE{r-0bx?af2sM+jHa-~}5}#+&AEVlRVdFuc zOguj7ETqHu^zRg~31v}B)(|y=wy1&hLM`#vs18S>4%GzIn{7K5!ONHfLmbyX^RlRp z8e@9whH8HTYUO65R~_voppl+Joz9!6J$s00@CB;j#IEcAqEQlc7V4ooXo2C_8};x0aI@FAF*myqF%uCyNC7epU9_Gd?s0QN) z7(>v%#F&xv0;qQDV=`=m0oX5q-@n!;FpvZ_upc$^V^|u`p$=V&KvOX-YNhg_23QU? z(<M82~5jZy7IVs;#YI{iPR|NH+*0vho-?10x$ zFPOsQyY|0xy9I1T^xx zsF}1uZAoWTheNOljz+zR&SO1%juo*=eAoYz%>>Lvd>v|uFQPj7glZ>t0yCi`sP;3V z|M@RWKzm#Xwd4&^ug+em$7d{RhD%X1T!&iX9jFctqUxVOo$~88eh>9A{08-YNRrT$ zFOHgM`Gh?Gs#u)_4ujJi{ckE%g$bw**P;&7cI$pr$N!+}U$QFqC-mRmbu1U^vAc|Ve4k+hjFrl4S#zvTyf;q7tvE`b|CLg^P8AaNp%3GyF*DnP8;O6! z78sM(tW?5uuK(L|0o03YG3qS*fqEP-qXrU|-u3_6Z&B3JpF_?32I{lpF~-vK|D1ph z%R8G9kii_jxTw>g2ETXt6%1-?{>W%v!N;&M@qe%p<_a}uV+86wF$D|bGSn;hBI?zB z6?Halp;v*&HsKX&q)wO_P&{i=RL5yhhb<>&#?q)QXos5dVAQL23aXt&=s(n`!@1GM z51|h6sW6^@6})CM9-vO^bJP-fGMRWBR0Anc1IdFry=71xbV03PU)+F0Q0?T-Y|=~O zUg8x|<>O>ACdtC{uRTdaf+}RixmXBW;z87sg=aM*&V?#h+{UX~8)910+u8Uq)QU_* zP4Fkw3vD@S07p?z-C3_K@D4TOpm5j!!(}iIBwh;jJa52kxE1{?hHB^m>P7Y3#)Gn% zElP;`ObJDGl+VT+pk81Rr~!Hh5y(JbGHPZkQ7f_)wby%W`f1c-brV(b6>6{JXEzOo zq7G|OYeiK3I;erRLp>#3Q7bVXIRjp24FT=lc2vi^ZTtwT;%U^%T(Rl5P^bG5YKvm$ zaGi130X4JxI1QbgW-F(oRx(>IGr^xwE4T_1>G|JGKm*u^>gWh+B~GEfI$cN2ENyPr z|6_DEtVg^JYD?DQ2t0%8s97G@|8@K*YJfp`UHxv;i9j9Ns`*_1&k22Tx1RsK1irTL_vdgE@%#l{=L6nGy^?PhGH=8JgQ>qXWM=fbl8?TI-Q6#EfchrocZ2BkVE4$82;>D19 zUgsbIeY~DT9lpF(%qeb#TH5W{4*x`Tkh!Y)RLg~t#M`0L_u2F#Ha*}gv$9=L1MGnX zaR7F}<^FV@zxdV6Op{|68QD><%o_OA<%Ouzd2=PKY2JKAP^Y`PjrX?k(b$dj z6<8fZYPn8%Y=he31*rVvI84uf>DuNi)mF?zhm-2qLsHiqrfpb=a%ZqU2G=ty)f)9G zo`f36LM)2=uq=K+?S1L`u2T*tpxD(ZJ zP($;1-xS#`r#I@U*x1N*Zs0-G_klHyO-K8%5%HU-vrwXmS=mTby$MZt{&iY^A|V`i zqdrFOqqZVeQ!}vas1esfJ(g{;6!yZ=_$%tr=51y^4NIaXP!qL6gVFzu2=#S+8S3%< zvzga4e3XP{Ah~LU`GVrKH{UH|yaYB;pi2kW{|AE^I=cS9>)nV;NKYMU3jS{G z-^um=rE~Vq=F{y4?x)<)F6OhKQdjdC604i}#&Zall0T!n>;D6%Vm(ZIt8f?T-iV&2 zV&-0a8j)}t7vrzJU1t*3>Ek++@jOn!&V9|#@h`9p@ecjW4=RgrBJm9UP5I@h@xS?GeAyt2FCGU9`gnLD9lDX-^$ zJ%J8bXqbAQ1AQ?sOLAqc=N`~h59B_2=ysi#-`Uty{em|-k_bWy=?jb z8y}5cHT*3BJzn!rkJoC{D|H8|gFUEM=n>Robq4j*aNq<}FFmTA{FoTaquQx&ZHIac zd!wHFF{twMCh+|08_BOE=sj=%^?W`?H4t~A=^z!V;asQ{C~e~{Y`iSo!4eOK+X6mYCz6p^CnD)nt4vtOiE!f?1_5UFGYRf zxQOcT4VK2lQ_N>dZOlkK<5crywj8!6J{UC+?*#&SXJ1F{`CHUpd#0HI1*2w|2FG9) z%!?~fPsv%-z>`il<-)AFa3<+Ra2xK&K%Sn_Gt3)w!c2d8uTx}}`9Yx^YUcGZ9=1h| zup4Sg`=XX|JceR4hT#^}nK_Rt|H9_KM?H?|XPa^hQ1y4AR`fWg)$@OyfM)&?HS<_= z%#tNS9kzU^50BcYfptbT&=1w&XjH@BqUz7H@x`c>jX{+^WW9(wE02_~=l>Z29j4&9 zW~NzC6-uH8P}9b{Vr}9>QQvm=qdLwK?dng5oWiJv6MSb*c`{5wJRI|3aa4X6)Zy-h z{-6Jc641xtXqzz|HGui3Em@7(a64wk8>pGa{@!$y7&Va0sPctS9aq5a*bsFncVZcQ zk9)A>Jf8n{9Ewl#%nugr=9_{1j5<_nQ3LrMci~Yik28LBogR1sdt$kt%)nNo&dPDr z*4(i^Ms39l)Ji8c^b8qPf-&~w9pJRgO`8`7RKV($YxAIy^t2;K=ffK=3V6a{{yAEsDVC2 zy;@(QIu8EXY)J^#C7um6@Ik2jv8aJhMQxGydjgu_N{qsTs8?~h#jd}@j;OsKi-mAC zs^e>@h900gc!@exflEw!V$@92qRvK6%#S5e<+>yF`TaiuH82V_^PiqTAQ{bAFNtUrPdj3NR=nUjXEqy)IVHtpG zU>53-E=4WnYE%Qip;qoNYGCJ4p8=0h0}oto$|Xl_aTZiRl~7MX2lT4LVFWa?MW~K` zM>Vhyzri!8J!`VUJf7`Qhp9K}EDS~sbQEglvr+YbKppB;sB*WgPf!zhvx4Vehbzvn z<`tVCa}lqBkvI_5;6>{VRQda;0VQ2&I?jMvnf$1gD36+HL)43>KdQrZsDbQ6t<-^) zUNhsXB&gzD)Xd&t7zVB~4Tq!lyeKNaCh9Yx5o+eWPy-l&n)!58hl^0{uCw{OZTd-6 zx$9m6YT%hI5VYF77?Pv*HW#X33Dlm|K$Y)+>RfI*>}ym*(KfycwS@aopBX2tS5O0fh#KHqYy7q5XTA)W zkMs)I6Z>KtJ^xp1fwJq&3nv0~T1R0xErwBGJ*b8cU{1V@ zT8X$ZW?(5%6Uc(9p9{5hr7@WPotgx6s+*!_;ze~l8MWtgP=|31YH5$5UcJ|C{1NK$ z{eG`W6xX6x8OI3tmlX9e`NqbRY%&$Ip=MALHG>MMGt&UI zwCzzd>VbNHe2tpGXw=F~#!y^@>gP|Je|8hkzY1IRX*VuvLeZ!dS%q4$?WjY27$@Qb)JhHTZnM82M0KznRdE~Y za2-I+NDJ&RKQgUH9irU7nZI-xgAv3(Vnb~AyZNQlM%+L=V5ez+Gis}TLk;LW zvI1V`1_2$42dI&|f0(^YgxQH_Lgm*)WzBbCZo2(hgy*%s1LQ<*cyX(nVEJ) ztzdtwfg}9sOzjW>9gctS3|>WzaLb>@U8uu&(0U2g;lHS@iM`tlEF~(Q6?KM+pw2>d zRQWbGJ^`=c%3Qv&fLs2Sh2eng#(kUeHV;iyxd4|P^bp|-FFs(yV8#qKtJ zGU{vlEX;~N)BrD`|NH+_0-Et#)Zqx&YYN1*rboSq3ZRy-hD~pZO^A0#o#sES2T>C^ zfm(sPs1^8t>NsSd`7W4!AJ4y*qB#jF*aPe0NYvgR$54EWYB23z=5Z=ut%w>}L)52W z57gd|N42{O)$UGI$EQ#ey^C6@r+<0PhfMH(^SBg5Eom{-S*VIyvJ3~zFOMptPWuYf zN(3J?rb7STqn`I7s1B>5RIwg^)VECV;D}iZon?YPoY+*%rSpEUZ)NLebH!xTAHD# z26v#Aa4&}9Ih+0#GZ7CsZdNWF_4pP4N+&LAF3TMmc?&Thw}ht z*YkgofEo-sWge3>ScG^1)G6(Z+LDo|a^Is)`5M%goJ74J68>Y-Ls8Fr6&vr0Ifze1 zwYLTJIG#Xn0Rs03WW=U(w9Z$w?qvn3PW)m zY73U3R^o5e0MDM``B%n!5>z46S+l2wQF~b)b!uCqPIGtE7W6@VdJV)LI0E&qe}r1{ zn&-@?Vlz~{C6>o7SP@s)^oQqo{%4c$hJq9&5zqB#rsQF~n;wNedHZ_3VC8hd*QR41?swKOkL&$WBW6ikeI8d9O2k}%ZF z%UHicJx=ve9koYo)d18XoQFC)TTzGexb+(9z2SXIAe6vsR70sRn?sTlRiHBJv8jo< zu|H~{3sD1Gi8_=UQ5_vXwQ~(Mk^itLx>rnoanuCrA?1@H%$Zi(0>@MUtxFh>!Z%jZ>Sa6gWA%QsDWKT_51K9&%Z|E z-ZGCzB2Vm0`>k_fW>hy>M{I?Iy0GWo2Q}-YD?;&+UXjUY-{U0IOtRiHhpGvxTzk}(^~6vd zjT+Dr)Cz1w9Y*gy0u2ZpLRHLg-)uz=)S)VadgYEm4e(o=zW_CZ7}Nl_qu%`oa1vfe ztxT^6rsHv_cIKkCcs@?m^S_dSmZ;=Ib2w_F3baA(ZBNwF&O*)L0O}on4mFc>k4#5- ztyNLw+Mov53rpcZ)W`1z)FFI|$@Kht9-BQ*ff{jsYc%)*NkhDpi|u%HIOJ9 zA8rfIMt#2jgqq2FY>O$Lo1f(dVm9KtP#xYwedwfkVGea|)WDjdwlWg6LSMh&`PX5Y zMS}KjF=`+_Ti^(W5xRsL(HG_eu$8|EQel)7XKxwHLFmE zb`z@nF6%MOrRV<&0qt?{JG10@P!-x?B=*1wcmm5|%lEGT|ETZ>tVDd=2lGqogP4){ zOVpmH_-JNc5OWgmfSTA;)Rrv5Ao_P!641MNJ=Vd^)}T*3pTrxXmiiRxl}@#Cl;&9Ztt{@;95!ZpOFqIVvFG65d{KP;ZbQ^dmqP5d2R zB3?bnQ~|js)%f7Mrmfb?6SF9=kiZ#pNp)>IJeUp2xppe_;dShp{rfpZ zM%BBAD*plXlq5=E2ACIh7D{^wXy$cMk3|cc(HXTwLs6%CB(xOgzQ5&y^+UxG96&;RxI%c2-8iS$u8|pE>jQ;=rFIEaO^JJ(Q zq(Pm|tf-24t;JDGR}nSCI@k!i;kURG)p3oK9_L4FgFoYYoQ(@onfirOn|8~i|M&kj z2xy60qqZOtwZuJ8U$usyJ_~kWKKvW?xP3sK{-*q&eJ;SSaWtk)YaY7=sB-5p36F1~ zbRMTX@ha&({@)>wOV9KFh=j`|%)!GM%;9UF(c}M1=A5A(=PKzFF^mSfg?ap+`;#+y z{NMi{;$P(F%alBx^RYjw!Nl1;{=eaBfyIbFux8F-4r5DeKh#q&5u4#U%#CsRfs)4bn=Y0~Yp`TG(xEj0R zUDOITEMS(tJ=P{Z5o_WZ)S=E?P@j%G|D6bEou`n;{}n43HG?n=#UiLBZGxGw z6Y6Q1h^jXo^>}`d`jA=K1N&LZrN{-6I76ft`lf+{coRbd%w#_@`p zQ=b^sQ6DUYL$Et;LajttF^~W6{&Qnr;(d{a#<_tS*e%rK`xHB2SaF_zE$svXdh<<3 z&1|uCAF6?B8U@!s0mkc0@05oZ4e1kX-X03BBfm1~(=ai9dBrC`17*jOH&l&s<n$)??>!ddP}?kS{e??-ayCVtwM--4|v-<*bzke<+X@R76~>uj@L6zO$A1Qscy>;$lqBJ(u(;lC+bA`;h*O@Bs3LaqHr3?PMZ- zmYF}Zq@iOJ8c)ViDs`aHDdKt|fx}N@&ez;k$?M5InmdZPu3j{hhC2aig>703+9^Ta zU!;YQrzJXeRQ02$#_Y|Xue5-YJC?&fYqitMK9`!nrcaV5p!h9zEe^&+4caXn$=SyM%kh` zibixDC+{V91h>B7#G;LLFofH z*p6}$uTSS4Xs90HRJPo&_%&rV*!XMPj*U87ZM-gJYH`maV>E5_rmfq2{`kMaeoKQs z3N9csJ(;?`<*r29RQ!jEg($O*czN!oq;;a)?}P(LU(LOru&$-HzKPKe>HI#+|NU_W ziTZL9kMe<}C)NCK5z*&=+b=3MBz}obm)k~56W_|cjC%p)`jgI&`TEZ|oVAo|PrL~2 zyuy;U9S`B#+$Biw!>#KF^3rjSCwyLYy%f+jp5+L&6?+g~Ooh()8)+HIPeLcr-2aj8 zQl~iSNmT~V*fttbUROENcXA&m+}7qPy$E5x<^A7lFm=6Isg$3)D)%#+m4(Xsma1zV zg+5;)gyVjW;8YsCZS%_!pGm!Bw!<8x$EVG!beMv>Ir%Nf`-w2$@SIwdeGtI^`vk(WhQf9=GN7cdp31+?X-hgi)pz> zQTGAqf6&fl+fFRZNnSczr@ivk7X6$5zfKCTAiN$wU(vR+4ph2I<>TBxlU9&;W2Mn( zQ|?cs|N2F}*OaM5BO^&0PF`iolqBsmVO=HcAmX4mA(_d@*n^+13508K*QCHHTPZ6I zq$O=K_Y_;Ow9U(e@9Y2y5WZ>iUywH1rZ1u1=W7mWGq~4l|MeBR1s!#yVp%##O2La{ zCc=7lq;WAD@g&?Y$-Bp`t0r}RA)E#uQa1@UL0uOE!EL z%l#c`D~LZNT%B-yTjnh7?ICR`?X)xHz0P<7MQ!Ekb}*E2{-aVQ8~>efQp)iA24}P~ z|K}QJ>ldZrQG`cP?+W1~w%i8N^vfyz79=C-*~t%}tzP>4uSmpW8%T~-$cW8ICs6n+ zJAfO67m^l17}W2k9Hc8 zSId?wtOE8Lhm&o17r&$O2bWQ}Dxt;rEtTHmpERPY3GqC(p?ak2noMU|Ff*NH^`}sd zykJ|W4*7#fFE?vZ=Vaa`#FEm&CR?|DM=Adg{O3s1)y?2_-jK0|!a>}+0xA5~1f4bH`7Z{fUt^50 zmHUz2f_NO8KaIM#K9?nZFY&~bT~FF1?tI*jNh?6!5ZX^gycIUkkGQ{)*o^x}5++e- z7V0WS12M#PHNvIDTQiUX+et>XR(jJk= zKTgvS_aPE%lBlbcEo@?Z64>}AI@?Z#>10Gvwwf*Q@^e9KK-nKD^EG94@mn$HTjC@9 zG2Z3m|6#-80Quf=UvwD22!m}r7vWVDx<;XQHZ28d6*X#m9iXEXq+?xIGlI_o1dRHuM^*7+a>7Cq|R*OG1~v%zUX8=8Qn?C z$=!tlC26EAX_bl3#S!X&1{V>pMtB-dpw3qXi?pwZ7okv1e=6UjNozs5e8jKezr^p@I$3D2Eq4wZkD^`? z;sYs{ggc!0B<}a5>H3Cp`>9_=|AaTwq&dG)P*)o=2AiP&SCyNnqYD!h~MK0Anpv{%fQsYBXQ@;-7WCw&O<3WOW+PwdVmA|c#+DcsQxLXAx$o>Bp> z4ir9wK3w%hnGd90qg*fQ*TvW5*T%$@c|=|U;@^{Z5DPKzjD&T)pp32~dXea=!5y2# zHB@}zPci>fm5K*Ri)}l-VNHnDsJoRq5w@|4l)Yrbs(qNd8s*Z{@m2B2;RC%P8>q@{sqM%2lY)kz3ag(k|ja(w|ViKHavallXkn#}E(3AUgnpPA%%hCcg*%O}_vA+nayO{F;8 z-*B(zuJA=iorssAft#eo*iJ56OOf~Gb&tqA%9XT(-)zg3v4sZF&K2%AHlCUM!umeD znZ$NfnoCA?67>~xs4euI@JH_UG@P7rdAW7{OxiBOJ+KFP6S&Wievi1WItFJq@ic@B z(*7IDbg}u$p2;ed|GdPjC~%p?oD@22J6TQP-K76b{D`gCoBTbb)upm))AAG7)t|Ho z6ZHRQ1`58Qd{#R5%Uc15}vB-JMFh9ulsL zSBc-Cu8NN&t-Q@wnJy$&#KAa&!PUeBek2KmB^KjdY!*0_Y>vfkk*}c+i-XI{O=j1sCdrQ z@&9i(+fkP<(o)dSD4X7k^nNsSfx8gl0o4EUDnPlRJKwX&NK2NxO3`d zU&L0PiRUS>(-ta4ULxD!APTSgpH5WlJ!L*$pD5Gji+F!qek18~nC-Xtzn6C+iDO9} zK*b0OHMSjIv<;0QO;*Z6Dl zSxY@#;iMXAu9o6L(5xf-3kLRy=o}f7?!dop@=6VxgjN~c zr+2?7N5M#ca8{~A(J|)_6%UHZc6_NDbLK>FK+M~JhP$)IoGlo${p>4u)~WO3Vt%1Jib*K z+%9f(>QMJhbe}Nyu&-Jsx2YSwHnY3b*D8w}?fL@3-F&XEOg6Wd$9F1++r|^UH@BP4 zS16A=-Q&BN&pjL9ds)c66X?5H+|5O+rT9Nv4XM|!cc-pBBAv$lBm0GRjEsut+M|E; zj52P1-_bJeydYoS%5Lubs47^Xt3gT;H{ZZiwp}+StwMMqg>-W{NJ@ z)J^4k-_-rajh^4!Z5Yd}d35upZYSTp=59JSdRR-hhF!F|t=#a_O3? zk?ykC1w-=}Dp{bQ??|NE&%@@2MW^oS9`l8EbN2@M()V!(=hXhE^Ns$&-QkJuy3j4` zd$!Qso!EDNz58EK^bMa|C2_ro&Ru&&FpnOgJ-W8<*W1@>i<{Duu1bHMg@{lNgJZ)( z*_}uwL=WHQE|1f@S5&{=J$gjUx^^hkH+j2zCCK;9F88$SYrEU+7~s3P&mG}LcRJt} z@XbHqj_^cRJ?yUZHT>H>@9|YX=8g{vsYLC_&JjH$dqs5(jqD#4*{@euU&hmJX4lvF zjN8HEJABTq8P^we%WdFBKfmqX^gX`go^pe#_lk&$^3}NS)(!GqdEy2I_}=~J?hJ}P z{o1YVEBD5I=tfs~=N9v&ey?5pJt76Y3Om}WzcN6CE#PW^E;|U3fZd$;T$ag5e zr)!{ZLJ`l=AYZ#up5Hybr)52@-3;b5^$r~n#X3Yfl_R5~B0BfzYU9y)D|qtx`d09) ziRG(S-BTi#??qit%h=IZntE#azG~)~;rh0<@YHmD6Iyx7xzX|4c*>@&-Xk<>K=06q z4jp\n" "Language-Team: Italian\n" "Language: it\n" @@ -54,19 +54,19 @@ msgstr "La password non corrisponde" msgid "Incorrect Password" msgstr "Password errata" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "La data di fine lettura non puÃ˛ essere precedente alla data di inizio." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "La data di fine lettura non puÃ˛ essere precedente alla data di inizio." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "La data d'interruzione della lettura non puÃ˛ essere nel futuro." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "La data di fine lettura non puÃ˛ essere precedente alla data d'inizio." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Rapporto generato automaticamente" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "In attesa" @@ -258,17 +259,24 @@ msgstr "Followers" msgid "Private" msgstr "Privata" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Attivo" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Completato" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Interrotto" @@ -284,6 +292,10 @@ msgstr "Errore nel caricamento del libro" msgid "Could not find a match for book" msgstr "Impossibile trovare una corrispondenza per il libro" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Non Riuscita" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Libero" @@ -321,7 +333,7 @@ msgstr "Messaggio inviato al segnalatore" #: bookwyrm/models/report.py:88 msgid "Messaged reported user" -msgstr "" +msgstr "Utente segnalato contattato" #: bookwyrm/models/report.py:89 msgid "Suspended user" @@ -333,11 +345,11 @@ msgstr "Utente riattivato" #: bookwyrm/models/report.py:91 msgid "Changed user permission level" -msgstr "" +msgstr "Livello di autorizzazione dell'utente modificato" #: bookwyrm/models/report.py:92 msgid "Deleted user account" -msgstr "" +msgstr "Account utente eliminato" #: bookwyrm/models/report.py:93 msgid "Blocked domain" @@ -345,11 +357,11 @@ msgstr "Dominio bloccato" #: bookwyrm/models/report.py:94 msgid "Approved domain" -msgstr "" +msgstr "Dominio autorizzato" #: bookwyrm/models/report.py:95 msgid "Deleted item" -msgstr "" +msgstr "Elemento rimosso" #: bookwyrm/models/user.py:33 bookwyrm/templates/book/book.html:307 msgid "Reviews" @@ -359,7 +371,7 @@ msgstr "Recensioni" msgid "Comments" msgstr "Commenti" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citazioni" @@ -433,7 +445,7 @@ msgstr "LietuviÅŗ (Lituano)" #: bookwyrm/settings.py:324 msgid "Nederlands (Dutch)" -msgstr "" +msgstr "Nederlands (Olandese)" #: bookwyrm/settings.py:325 msgid "Norsk (Norwegian)" @@ -461,7 +473,7 @@ msgstr "Svenska (Svedese)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (ucraino)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (Cinese Tradizionale)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Oh no!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Permesso negato" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Non hai i permessi per visualizzare questa pagina o eseguire questa azione. Il tuo livello di autorizzazione utente è %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Se pensi di avere accesso, parla con il tuo amministratore del server BookWyrm." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,19 @@ msgstr "La pagina richiesta non esiste!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "File troppo grande" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Il file che stai caricando è troppo grande." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +" Puoi provare a usare un file piÚ piccolo, o chiedere al tuo amministratore del server BookWyrm di aumentare l'impostazione DATA_UPLOAD_MAX_MEMORY_SIZE.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +978,7 @@ msgstr "Salva" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +996,7 @@ msgstr "Il caricamento dei dati si collegherà a %(source_name)sLists    , Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Usa le liste , Discover, e I tuoi Libri link per scoprire i suggerimenti di lettura e gli ultimi eventi su questo server, o per vedere i tuoi libri catalogati!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,7 +2599,7 @@ msgstr "Notifiche" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Il tuo profilo, la directory utente, i messaggi diretti e le impostazioni possono essere accessibili facendo clic sul tuo nome nel menu qui." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2826,111 +2846,121 @@ msgid "No activities for this hashtag yet!" msgstr "Non c'è ancora nessuna attività per questo hashtag!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importa libri" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Importa Elenco Libri" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Non è un file di csv valido" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." -msgstr[0] "" +msgstr[0] "Attualmente, puoi importare libri %(display_size)s ogni giorno %(import_limit_reset)s." msgstr[1] "Al momento puoi importare %(import_size_limit)s libri ogni %(import_limit_reset)s giorni." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." -msgstr "" +msgstr "Ti rimane %(display_left)s." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "In media, le importazioni recenti hanno richiesto %(hours)s ore." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "In media, le importazioni recenti hanno richiesto %(minutes)s ore." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Sorgenti dati:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Puoi scaricare i tuoi dati Goodreads dalla pagina \"Importa/Esporta\" del tuo account Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Dati file:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Includi recensioni" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Impostazione della privacy per le recensioni importate:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importa" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Hai raggiunto il limite per le importazioni." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Le importazioni sono temporaneamente disabilitate; grazie per la pazienza." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Importazioni recenti" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Data Creazione" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Ultimo Aggiornamento" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Elementi" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Nessuna importazione recente" @@ -2966,7 +2996,8 @@ msgid "Refresh" msgstr "Aggiorna" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Interrompi importazione" @@ -3064,6 +3095,133 @@ msgstr "Questa importazione è in un vecchio formato che non è piÚ supportato. msgid "Update import" msgstr "Aggiorna l'importazione" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Importa Account BookWyrm" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "Questo non è un file valido per l'importazione" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "Se si desidera migrare qualsiasi stato (commenti, recensioni, o preventivi) devi impostare questo account come un alias di quello da cui stai migrando, o sposta quell'account su questo, prima di importare i tuoi dati utente." + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "Attualmente ti è consentito importare un utente ogni %(user_import_hours)s ore." + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "Sarai in grado di importare un file utente su %(next_available)s" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Fase 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "Selezionare un file di esportazione generato da un altro account BookWyrm. Il formato del file dovrebbe essere .tar.gz." + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Fase 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "Deseleziona le caselle di controllo per i dati che non desideri includere nella tua importazione." + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Profilo utente" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "Sovrascrivi il nome, il riepilogo e l'avatar" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Impostazioni utente" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "Sovrascrivi:" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "Indica se è richiesta l'approvazione manuale per gli altri utenti per seguire il proprio account" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "Se seguenti/seguaci sono mostrati sul tuo profilo" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "Se il tuo obiettivo di lettura è mostrato sul tuo profilo" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "Se si vede l'utente seguire suggerimenti" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "Indica se il tuo account è suggerito agli altri" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Il tuo fuso orario" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "La tua impostazione predefinita privacy post" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "Followers e seguiti" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Blocchi utente" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "Obiettivi lettura" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "Sovrascrivi gli obiettivi di lettura per tutti gli anni elencati nel file di importazione" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Scaffali" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "Cronologia lettura" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "Recensioni dei libri" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Commenti sui libri" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Liste di libri" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Liste salvate" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3242,7 @@ msgid "Reject" msgstr "Rifiutato" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Elementi non riusciti" @@ -3747,8 +3905,8 @@ msgstr "%(related_user)s ti ha invitato a #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nuova richiesta di invito in attesa di risposta" +msgstr[1] "%(display_count)s nuove richieste di invito in attesa di risposta" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3864,6 +4022,16 @@ msgstr "ha cambiato il nome di %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "ha modificato la descrizione di %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "L'esportazione dell'utente è pronta." + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "L'importazione dell'utente è completa." + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Cancella notifiche" @@ -4107,7 +4275,7 @@ msgstr "Rimuovi alias" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Utenti bloccati" @@ -4242,14 +4410,66 @@ msgstr "Privacy predefinita dei post:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Stai cercando la privacy degli scaffali? Puoi impostare un livello di visibilità separato per ciascuno dei tuoi scaffali. Vai a I tuoi libri, scegli uno scaffale dalla barra delle schede e fai clic su \"Modifica scaffale\"." +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "Esporta Account BookWyrm" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "Puoi creare un file di esportazione qui. Questo ti permetterà di migrare i tuoi dati in un altro account BookWyrm." + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "

    Il tuo file includerà:

    • Profilo utente
    • La maggior parte delle impostazioni utente
    • Obiettivi di lettura
    • Scaffali
    • Cronologia lettura
    • Recensioni libro
    • Stato
    • Le tue liste e salvate
    • Quali utenti segui e blocca

    Il tuo file non includerà:

    • Messaggi diretti
    • Risposte al tuo stato
    • Gruppi
    • Preferiti
    " + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "Nel tuo nuovo account BookWyrm puoi scegliere cosa importare: non dovrai importare tutto ciÃ˛ che viene esportato." + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "Se si desidera migrare qualsiasi stato (commenti, recensioni, o preventivi) devi impostare l'account su cui ti stai spostando come alias di questo, o sposta questo account nel nuovo account, prima di importare i tuoi dati utente." + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "Potrai creare un nuovo file di esportazione su %(next_available)s" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "Crea file di esportazione utente" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Esportazioni Recenti" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "I file di esportazione dell'utente mostreranno 'completo' una volta pronti. Questo potrebbe richiedere un po' di tempo. Clicca sul link per scaricare il file." + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Data" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "Dimensione" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "Scarica la tua esportazione" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Esporta CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "Esporta Elenco Libri" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "La tua esportazione includerà tutti i libri sui tuoi scaffali, quelli che hai recensito e con attività di lettura." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "Il tuo file di esportazione CSV includerà tutti i libri sugli scaffali, libri che hai recensito e libri con attività di lettura.
    Usalo per importare in un servizio come Goodreads." #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4487,7 @@ msgstr "Sposta account" msgid "Data" msgstr "Dati" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Esportazione CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relazioni" @@ -4705,7 +4921,7 @@ msgstr "Code" #: bookwyrm/templates/settings/celery.html:26 msgid "Streams" -msgstr "" +msgstr "Flussi" #: bookwyrm/templates/settings/celery.html:32 msgid "Broadcast" @@ -4713,15 +4929,15 @@ msgstr "Trasmissione" #: bookwyrm/templates/settings/celery.html:38 msgid "Inbox" -msgstr "" +msgstr "Posta in arrivo" #: bookwyrm/templates/settings/celery.html:51 msgid "Import triggered" -msgstr "" +msgstr "Importazione attivata" #: bookwyrm/templates/settings/celery.html:57 msgid "Connectors" -msgstr "" +msgstr "Connettori" #: bookwyrm/templates/settings/celery.html:64 #: bookwyrm/templates/settings/site.html:91 @@ -4730,7 +4946,7 @@ msgstr "Immagini" #: bookwyrm/templates/settings/celery.html:70 msgid "Suggested Users" -msgstr "" +msgstr "Utenti consigliati" #: bookwyrm/templates/settings/celery.html:83 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:43 @@ -4740,7 +4956,7 @@ msgstr "Email" #: bookwyrm/templates/settings/celery.html:89 msgid "Misc" -msgstr "" +msgstr "Varie" #: bookwyrm/templates/settings/celery.html:96 msgid "Low priority" @@ -4763,7 +4979,8 @@ msgid "Active Tasks" msgstr "Processi attivi" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5157,9 +5374,14 @@ msgid "No instances found" msgstr "Nessun istanza trovata" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Interrompere l'importazione?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "Questa azione interromperà l'importazione dell'utente prima che sia completata e non puÃ˛ essere annullata" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Disabilita l'avvio delle nuove importazioni" @@ -5172,70 +5394,107 @@ msgstr "Questo è destinato a essere utilizzato solo quando le cose sono andate msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Quando le importazioni sono disabilitate, gli utenti non potranno iniziare nuove importazioni, ma le importazioni esistenti non saranno influenzate." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "Questa impostazione impedisce sia le importazioni di libri che quelle degli utenti." + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Disabilita l'importazione" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Al momento gli utenti non sono in grado di avviare nuove importazioni" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Abilita importazioni" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Limita la quantità delle importazioni" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Alcuni utenti potrebbero provare a importare un gran numero di libri, che si desidera limitare." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Imposta il valore a 0 per non imporre alcun limite." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Imposta limite di importazione a" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "libri ogni" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "giorni." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Imposta limite" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "Limita la frequenza con cui gli utenti possono importare ed esportare" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "Alcuni utenti potrebbero provare ad eseguire le importazioni o le esportazioni degli utenti molto frequentemente, che si desidera limitare." + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "Limita le importazioni e le esportazioni degli utenti a una volta ogni " + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "ore" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "Cambia limite" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "Importazioni Del Libro" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Completati" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Utente" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Data Aggiornamento" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Oggetti in sospeso" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Oggetti riusciti" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Nessuna importazione corrispondente." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "Importazioni utente" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5554,22 +5813,22 @@ msgstr "Collegamenti segnalati" #: bookwyrm/templates/settings/reports/report.html:66 msgid "Moderation Activity" -msgstr "" +msgstr "Attività Moderazione" #: bookwyrm/templates/settings/reports/report.html:73 #, python-format msgid "%(user)s opened this report" -msgstr "" +msgstr "%(user)s ha aperto questo report" #: bookwyrm/templates/settings/reports/report.html:86 #, python-format msgid "%(user)s commented on this report:" -msgstr "" +msgstr "%(user)s ha commentato questo rapporto:" #: bookwyrm/templates/settings/reports/report.html:90 #, python-format msgid "%(user)s took an action on this report:" -msgstr "" +msgstr "%(user)s ha intrapreso un'azione su questo rapporto:" #: bookwyrm/templates/settings/reports/report_header.html:6 #, python-format @@ -5593,7 +5852,7 @@ msgstr "Report #%(report_id)s: %(username)s" #: bookwyrm/templates/settings/reports/report_links_table.html:19 msgid "Approve domain" -msgstr "" +msgstr "Approva dominio" #: bookwyrm/templates/settings/reports/report_links_table.html:26 msgid "Block domain" @@ -5722,7 +5981,7 @@ msgstr "Imposta il tema predefinito dell'istanza" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Uno dei tuoi temi sembra essere rotto. Selezionando questo tema, l'applicazione sarà inutilizzabile." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5776,15 +6035,15 @@ msgstr "Rimuovi tema" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Prova tema" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Tema rotto" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Caricato correttamente" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5833,7 +6092,7 @@ msgstr "Non impostato" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Questo account è l'attore di istanza per la firma delle richieste HTTP." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5905,15 +6164,15 @@ msgstr "Azioni dell'utente" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Questo è l'amministratore dell'istanza" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Non è necessario eliminare o disabilitare questo account in quanto è fondamentale per il funzionamento del server. Questo attore firma le richieste GET in uscita per facilitare l'interazione con i server ActivityPub sicuri." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Questo account non è individuabile dagli utenti ordinari e non ha una pagina del profilo." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6048,17 +6307,15 @@ msgstr "Crea scaffale" msgid "Edit Shelf" msgstr "Modifica Scaffale" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Profilo utente" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Tutti i libri" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importa libri" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6206,7 +6463,7 @@ msgstr "Commenta:" #: bookwyrm/templates/snippets/create_status/post_options_block.html:19 msgid "Update" -msgstr "" +msgstr "Aggiorna" #: bookwyrm/templates/snippets/create_status/post_options_block.html:21 msgid "Post" @@ -6412,7 +6669,7 @@ msgstr "Segui sul nuovo account" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s si è spostato in %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format @@ -6886,8 +7143,8 @@ msgstr "Ancora nessuna attività!" #, python-format msgid "%(display_count)s follower" msgid_plural "%(display_count)s followers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(display_count)s follower" +msgstr[1] "%(display_count)s followers" #: bookwyrm/templates/user/user_preview.html:31 #, python-format @@ -6922,7 +7179,7 @@ msgstr "Lista libri: %(name)s" #, python-format msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" -msgstr[0] "" +msgstr[0] "%(num)d libro - di %(user)s" msgstr[1] "%(num)d libri - di %(user)s" #: bookwyrm/templatetags/utilities.py:49 diff --git a/locale/ko_KR/LC_MESSAGES/django.mo b/locale/ko_KR/LC_MESSAGES/django.mo index 463d8e4c894816c586323407234882042c4daef3..5aab5d85ba1d7b7939310cb6522bd262d242668f 100644 GIT binary patch delta 19690 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 No3?E8%AM0Q{13K7U2gyY delta 14828 zcmYM)dEAdx`oQs9_T{nj$oinjzJ`brqEboHP(o2?A*5-BzG$&lvLuD5M6}r|Yob9^ zsGcxwT1S?qWvHb3eLl~9y-Tk#N9#An(jNhw^9)o~YA!0*Dpa3t*t z?UJNql4O#}JXE1$E*8brSQJ0; zQ97cLIZz*HE};S z$KTNL4LhZYv_;2XgeG(qx^Q278i#eF{$`fdIW0{#8lX1X-wa*29h%TZXuxaGiVQ*% zz70pY=;-a?Ni7ft+7w0}l7_9q%QQ{>_#;gd`%U?1#(240Rka2*!J30>3vNoe~q zG{F35KaU1}8BK5<*2f)ag?_?9SfpEe*GeJdGD%GyEJYLa4qTAFNQR>ej6-)Y72Vka zG=Z1UfNRkC8{+-$c>hVf{}K!H{yQv!KZd6;%kMw`C28hm&;eDVeHJ>gG5U41LU-0J z>>d4surmE)urWT09>o?k@%`vg9EtV`e1vw9ONsCI|2PlsU=fU zfwqOY=n?z}P3(L0GX9Fi@DDV8k?v`K1+*fS!$#eye{ni4q{9WeqnD*GR>2YIWt@&K z^klT3#uBtwhMUp(yU~gq#7g)hx?r)()5NQx8)||ju=VBCzdR3}>Bz!9I2dn1cknJc z@BljT8?-XV(USj(9$kSe(h8IhtD_q`2mOI+iH_@y{$X}A8t=^v51#qkG2s1p@g-)_ zex`D&d{t2zf?^q4aySkh_h_`2qKRxkceD*%;N56{f+qHD^#6p;&(|xha5g%>ZZGOzmWL*ESb>W$ zuT)rub`LCvH=+T?pb1V#cQ6-Cd>NjFucAlzF`Cd(bo?oFT)}J7BPoZjd*(IN-%K0Q zp>5ECov}IgL>GDht;l2OxCQ9WpGPm*YOIU<;{9)!w_xvdW986xB{ZQr=vUAz!^0Uo zw8rw-7G2;;OQUgk``Ytzef zCYoU#tcWeqL@q;1dM#SgThKsb(4Xi@*cqQe6FrQc?T=`Jzo9$M|F=m>fyKcEZd=WinwupHW74^80wXkUijjT_K}N1_{;f{vSu-l6BB{W=V@7L* zk7PM!%y=yiX1Wb+zmM+l5PB)UMKk^#U7+Cg>HBOnp=#*-dgx_rgI4YWG)`A^+~v{k zgBxl0zn=3qqpJPV!1d6bwL|;6qk;Ow`+-=Q_9(1^4`Wqaj+S@_TCu%ooI`jn{uuA; z-jI%KivCibcLVj$`^@ODBm>Y(bt}5#3|iVLXeH){E71hEqZRug+FzjazDIZdD_WU9 z(KuQC)A%{)yp|arOyD9kU{^G=Ug%E7paC94cQ^;D;X-uh8^eQ`P5UIe^O6J71#4h+ z+RdYV6&iOC=525^51#40;S992Poo1iM|&qa?rXIFBwCSVV0uIq&>dGpcUBwSP&4#S zbU=UTx?n5phHd@+Gdy_4>(Rhl(Vf17jWHJuT;RsEQpM0jN})Tc88$@!eS%BHBpDc}zH_(Z1qnB)7-hd=IhTe$+H>C?#LfiE*Z)fOd*ac0fKbr7x zJO}T>2DlJC>Ro7JdoYXjlh1gtRL8>K(9#wflqOUKtw`-?H$(%pL>KIYXXDlJ{+@6G zn%ER{{xfLhUckJg#f%R-d2lE1qu=R4^tOJ3-i2S$g~|_3zml`iaZS+q?a=vM;(d24 zNc-C8?}v^bgeEcq3*bG2slOBNrNh!cfS%z)*bWz>iTpb}j!sN&PAgUry=-N}95m6! zXoWhUmAxE|-#6MfhQn{B{+4Jg9R_*~3*ocTUJ>neXy7f;-W%=x=u!O#UFdYQi{6s% zxH_6hef0f#SP(D9LfAdSg8{Bazw04rsUAcp&O{epjD>L}TEcbcpJrRp`3JBP9!KXF z8j{X08`i|a^f$#K*anT8>Bxf_U4>?NEt=V&Xy1xX{ChYaU2t-|Ux0oM%P~K0#v-^C zJ*wU4`@QHoU!w^gLDtJ8CwaJsj{HN@BN&HXs%dBN9ef2 zXys0zi53`^E_fyurF}NGz$RG2@Bbzq3^W400~67VXP}uri!S&Ix}z<4HvS6@cog#% zL@QO`)-;h4XhqJ%+p!vYxu;@HtI!xf-XrOP=ot{8{iVNP6Rwf4>*8sDy zH5#Z3I{tF>&h(4+pm;wTO>AuRKY&(d&K=a>fX~rU0#~5{--v-b!u{xk|HS)W(ecUf zG;kKWk&0*nInk~g@0(#w`rD$P>GkO6epe=5%t9Ali|%X_8gMt3!rbs1bSEdG{UIsbV)xWLm`2A885Z^Ux=Av)nO zTEZXEg^G+$6Rv>1uYn%LIp_vjp&K|q-giRR>5h);W!vxn#uzXx92En`;&r^Aie~<8 z^dChN_$@4SSNg|vIkdkCy1@BZ9xp{J+aFDIDAvM}nD^)Z93IU0DKz6H=!6&039n*l zd?VU>(Mlb}l6Vvicq-b}#-xAgY=|au8G2Xxpz{Vr|ClkHe_1;2r^8I=q9uO;{VcbH z@1PS8pd~zl2K*`7f1rsLygPkg61@Wz@j+~g74S7Qp?A>@etb9e_Y!?Whk;L^mG~nD z=KnhviFO$@p-b^=?2SXQ-97vPgiCNO4*LglG3TG@UtX(^O_DolUydE|4K$H_h%x*Fb$bXC0(06!Ur0>h1?Ml(E z8#YEi&vUUTUW^_^56rs*==;&={0GqWW@Dxj4^Q%-YtV`Bq60rhcX|X3a3bCpnwpll zJeu%1SRXr~pXnWFoblnq==}MZjW42~`@g30{d)`l9UUjp@4xu8G(Zh>VxzDFy1t=t(Md(lAq!*9?X{){G4a(a5HYM_A! zpgXz?OW;Fj0#9I3TpaBc*p~Jx?1snDby{T}N+)(kcYYNbU~sf=!(GRDho7Je9!GyUPh&5vK8O1IViXT%HW5u=2Ik-s_!@4A z{!x#m#0q!^dYkV@$3KGxUWv}zfF`&n+J~b3KlF#MU}j$Wr&vw2qjNX_O=K(@;6C(n z&5riVIGpwtG@+(X#OH`6(gmG&b@UHH6S@tJJ06{vnZ!dy9%iFES%GKbE*y2w9Ie2~ z=r6V?4O|9Iqy~CK&Cnye5RG>Qy6`n<+?&z&cVd0aETaAnSWbtf-hj6Mg$DQto$x8T z&{6dLA80})7pL=Tp@}xc9PEU(a1griBsBg^^w!Uh_VbG~X~5NV82ByB#$0qq$I%L% zMvtPv(`lgWuqK*V1GKd5!@r^NMn(Jn@F_IjdMt%oGd#G^`)H5r=w}KTcQEGpo#Ux zGjK3k>LJme!2-0WVi9~Kd>jkXUW_iZ6isYp^uLb1SU=eu1IjH)Gp&aH0M$oJ+8Mpg z{n0ZY8_qz-J&PXM=J2C<|9!kaUbYI?`bsASI{Hb9exrXM;H7vEW0di*TM4Kzocz+Tp8Zv3;OR4r=vSu z9Pig*VcPGa3Fl%V{2H6!QS`D_c|PrLj3#<6dKWsOccBO7{rmq>JXp#pXr|AgJ9!OV zXlJ+=4Rj#he~aG!U&5lx(|J|GhG-(~u_pG2_DFQz1IsyoFVkE)isDP?PF_b7cmrK< zFPhkAXk~ti{=zHL@f9$K{;Fua_UMAW;{6yj-Z(Vg!{~bRS5SXT@?3PRMoYR0-T6Cs z96v+@Y<(fE)CcH7$I<=*FQx%2phr~$t6^*Ou3Qt2#w^;i(0Pk9Ja~Cl;U)MkT7m4B z(jSQGSeJHVw7+-Q53^_wLU%F}tzPU1OO>6J8*j!304NlzXeFbo|q z9SyKH9gu8`_QzO*{_mo{=*sjTuWMpy`maD2?2l#e{_rt$Bg@dZJJ5~f=E?bg!h?6< zD=dXSL_1lP{ zt71TZJeL>4u?Q|f6MG50OdHUJ52A^DfgZtO^wQ;DlkTueSTAgij_-oT>5e8e4D*Y%i#(1r?}|abO&|NzqqtU6YYUs#(vShCEkxle_tNLMz|Cm zm%Enp_u+Foygc8bXH@Xjv|SF}aTBz^HRkOEo!1@9V{i0~Z$)qQ)Nl?uZxI^jCG-!u zSJCh{4&YKYZkE3V(6k4g5(W86| zD`4gT4`%p%cseY$E)7@-O`sNLV?FdU>xj;~8NJP;!w1mukD&=JKoeSmUcQa!QT-c< zmq~u(!2o5}r`AFPvIBHDjNyY!|sp~mPh>$zxR*P`(U#{1!z z_y7MH6CL;4!GLM#Sr^}&PN_C4J_eJ}w z%`E361Bg%5`((H#_cGu>%Lbf@*vg)czI_eGCzNVG?V6VP=Y zK@(b(i5E-J%d{4qxCtG&6J78iTH2%N0)L?avbLu0%ZGK)d2P^=UxI#qSEJ*Hq3hfk z?aVzqIB%=t8%mr5=SI^?l(? zWLzd$%!4~yh3<4adbS79#C|{np9+h-l`c>*tcz`V-v+J8!T%?dXb5ybeuhD3-+uSP5sNrGF6(yb~S&CAyIx z;(fk%(mPQVjZ+(~a65E-H}uZ*&hSu^hknS9Ut-&YI=q`s?29F6kBoK(oj4bZ;X-ub z=dlN_N57)t?-4g2=a18AU$BS&jRD`mPw=U|e3rb=jNQjeI;Qh>oCB~uUiv|Lc_yO^ zJr}MFH-xQ@B)z|?yU~xQ^zUTk{m78W<2AxnFv#>E*`tzgz zN-RgaFZvnXfq9idE0PHxMDNH$(VmOLXfH(L7X2tqARB8Xx3M4(2D}&zbSWC(Ds;ki z(LWT=r9C3r&&B%}qrCx5Xe-viJ?PP%#9CNs|LT(6|5Iu8=|R6VuG6bgr;&pPjvhMv zjz*majvm}Lr+L%nEgLm$)~IRooTe?>HgDaaDgT-E!>p=>Tjexs)wb!mtIN$ktNQAW zt8%IpJNm+!V{<1RTd*c)*1$bgs?D8o?Ed*V$L^babn*OSPpru~wsd^Xv59Mr&)#_C N^;cF;-!r@N{{g!gJbeHF diff --git a/locale/ko_KR/LC_MESSAGES/django.po b/locale/ko_KR/LC_MESSAGES/django.po index 9c01bea99..b7acabe2c 100644 --- a/locale/ko_KR/LC_MESSAGES/django.po +++ b/locale/ko_KR/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-02 03:27+0000\n" -"PO-Revision-Date: 2024-02-06 16:05\n" +"PO-Revision-Date: 2024-02-08 05:53\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Korean\n" "Language: ko\n" @@ -294,7 +294,7 @@ msgstr "" #: bookwyrm/models/job.py:22 msgid "Failed" -msgstr "" +msgstr "ė‹¤íŒ¨í•¨" #: bookwyrm/models/link.py:51 msgid "Free" @@ -1804,7 +1804,7 @@ msgstr "둘ëŸŦëŗ´ę¸°" #: bookwyrm/templates/discover/discover.html:12 #, python-format msgid "See what's new in the local %(site_name)s community" -msgstr "ëŦ´ė—‡ė´ %(site_name)s ėģ¤ëŽ¤ë‹ˆí‹°ė—ė„œ ėƒˆëĄœėš´ ė§€ ė‚´í”ŧ기" +msgstr "%(site_name)s ėģ¤ëŽ¤ë‹ˆí‹°ė˜ ėƒˆ 활동들" #: bookwyrm/templates/discover/large-book.html:52 #: bookwyrm/templates/discover/small-book.html:36 diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index 1a92d92fe106735d258001fd68ee43e4740efeff..6332c1b5cdfb7a19a47f5c23fe988ec495271806 100644 GIT binary patch delta 29766 zcmZAA1$Y%#!>-}k0Rn_zK>`E`7CaE#-QC^Y-EHvV7NodKacOXOcPmodtyuB$Kkr_P z@8X=f&h%dHGkYiD`_Gt{(RMzI=KdWJdAh^ZHHzaT#krXrr&LtJb(HEj*?Kxo5)8w5 zSP|1;Q%ry(F&WOm3b-AMW0YQwQxMByD2~M1_$M~O7`+|mfaADM2LjJX2<<~6ChqGv zL6{b^V=*j=JuxG0$AtI*Q{h+4fyw(hPEo9mRWTg1;R8&83Hm!uZp?+Tu_Ff3zcY|P zFbUI8BaXm|_|{v%af%FZoctcgse|!JpE}TSw&4m4#HNGH3iQRA#Ajd#KDX%sgH63` zr~#M4l-L%N)4wy8Kmz;&6XRYR{|jRge~mfuKkSYW& z8sa$7F(byooY)>qp*x(w1_G%u=TOI4igm5uaS8Fo!yIQcmZtC+Jc}=}-UwC!%Z%iV z_%KkcP27*d8?hO##&}ecdvO(Z80$EbFyT1Xza4?);~ZxJ#u?8l;09~`368Upc;tzW zL(o}^`>+7Dci=bc*2$a;;@zh>&V0-~)p0l$&PiN{CBw~@y|b>F<~UnPZ#A7InoA(r z498(o&JJtgnU2GxodehgOa0D4#I@KPU*iyLJkzov@2L&v7afxP?D3GsD+RGP4|oS<*+?lz7_3j?)rHVSRj#^|163$7zTQF%-XJ z3(U+uHp9u71>a&^3|{6qJb_Mj%#7|z0y`aSd~|0!w({ei zHLJBKs$w-%2MsVCwnq(QD#pM$sI6InD(_im(qo`jAP`kP1G-@ZvJ=n}wnXh=2UN$y zP)i+-+M+qAfh|G}cpb*V?WhKiVMaWUTFGyy0XXZ8eyA0Sk7_5)de%QHfiMy@kY<=2 z!%<6i1hoY>F&Dl@4!)CigE^$fFgNk1sHY%!qiJ{$#wR`&W8wnT1lM9L{1Y|6gL-v# zAaIm~l$c|a89*&m#nGr0n1Pz%e4LIePy;En*>OJN9sCoo@gL22LWEiJnW%P_pwc&@ z2C@?a@PJD|Bf5;i_y9GKC|k@sJRNEPMKJ-E#je;GljB)b2d^*=enT}JbE~NrjFE|_ z$3&O~V`FJlziw??pcU%yv`6iAZ`2+QL=9jJs-r0w7Z;!!*of+2A11`ZsDa!>o%WZg zv*Oui2Ih}ii4>S$&wmC2I;|~H4er6Ccp5d3>Dx{E98|}vFfZ;x<$pj8^s9|W+hGP8 z3w0QiqE@a9YUvxH+G&X~_5Ant1{`MuYH6loCtQqqFwRcXVOg9(d?@DN&6sExk0$Yo zyX{J$R%nck&qR)ivlR8_th0x0!#UUlzhHo#|N48)l66AOXfSG|BTxexXY=RS{53Xz z6KZR=qYmeO>j?}dei1dG_oyZJ*=Nf6qtX+gtBlkH)KC`G(&R!FD1$mowQRgCD!(@- z!O<9sOHk!5;81*M<8Ahv&-wnS_Wcf+2?d}AoazAUuLd)bPy-903Qj@o=`7R=EXSU> z1p_hDLG#U~1g0e31XJKp)Cw-bc(?*Jk)5c+eH?YhE~EN=aL_d$kN=Y3eIp$*1;bGB zLa2tyTN`73;@wd*UyFKw+(e!FvWLw;>Y?iOLv7^*)WoKt1~eBnfK{#y>_QbhgW8hI z7#VM)9-jxO0ll{IZ#EwFh)Iu+YB(jTd{)$q^P^^58r5Dc)K=BEx}6BbCt(Px!gN$a zi%^fvdJMwDHhve?;79aD-=iiT6E(o3sCF`-+RcU9!tyr1KC1mT$X2>eF9L~3n1CAD za@5jnM|FG>qvB&!#n;#hzoTZ_;+W~UGpgJG)ZrSA+LG}Y1?Qm#vIO=1*o@Kj{J-!9 z_+o$>xpUkcDt}akP)v%2u|76Hb+iSe;U3f>Jc=6NQ&hc=sB%$HnDp4F0VPA7p-`pM zztfI@D)d3k_&3zjEq{H2I)x9(&R?XtPE-eYN3|CA?l3uLzSP3`mkAq+JbG?{nitxnO?N=D0t7ChD#ST!mMjr!X30@ANrzgxFl#B)p4UTdRbxzn?QDDus{S-oyYo=> zm!Sr{9W@a5FafQ=1yn=tQ8WI5de!=#Gan|&F&6P6sD>+J9IS&{k+v8U2cy~N)O;8fb6y!7-?g z$D`U=gsQ(5wW6D>J5luyp$2vWHGxZ4Sbt^QAfYDS#r~N4DkH;1tkwUYl{rx!g2QE!+Ph>r=0r$U{De5jdK zz#yz+?Sb0sNvOSEVAI#3266(m0F^6`LaA<>vycl}A=fEDK!>Izs>5>D zI;f6Xp_Z~Is-r=uC7ys9*ag&5-bAh7W7L+uL#>2!$J7fzz35V*>Xk%)owCXVDwEIv zQ{XBL!V{M(z0vjDqh`GyP)YzK{5E zjkrH*fX7j1<;o-0Un6-=f|m9>X2)2M&5vHiP!;-ND2~FY7=fy{8s3l>B?nxJ>7{K@fmD~_ien=Q`2E{)IeS9 zc#KYb7HUP7pjPk?RQuadTXRqqbn367M*a|0!RMJdG|@0U@tCL%a$`y?fm(r9s2TRb z)c6}}z^hSPv++msF^)SmHU7y_aBC0yMIi(zoXs*^HE=PmS9{x|GNmp#xvHxF%I!ps1AN$ z4vhMS-veO*R7V3b7LG*CbQ)?Pb5L8h%*J=4+Bu3^iL=&Q=xVQ?6Ho=;x8_tP$GF6^ z+jvP-2X!$qHbD)zA8ICJP%F0>by!zoCOnTC(0A0#qrNi(_D2mQ=pF0tPap#cGB;+& z5~w}xjT-ql)QrPze6Eczwehv6m54wM>=35KOE&+D)#tsLfFG*8H1An|%`^)M8fg)0 zIn<16pblq!48Ycy2K%87<$P3!JJ1hLpvqrHwRacQ&U2gp7PV5}ZF(g4gE`fHsEQd- zBg=(avcjkaN}yJvJZh%Zu>dwh4Q!ru1FGIZ)QTR%YqXj$492LITw> z4BKHAoP%oMII7?k)Jz|u2J*q?f4BO5G)o(ZIs;*-J+6>uWn8E^(B#C@ptuVOMi|1Sur z1HaE^sS=_(DubGFZPbigqqe3q>Z$32YIrIpz+I?4zkurCCWhb}OoWNPn0~@g?H7`I z{wosDE3^Tsqd};SMxtgq5jE2}Hogco<8?M3ffI=zz|2_ft7&Jjbrfnq6EOuYLA84j z-FO7f5r~8juo^x=4J7|JGmzp~kaz{u;TnyqHvzRmi%*$)WSble^u;Gf-1VGh9{y%ybv|hb*P38paymZlj7f~75R#3k#C3I zjzUoFWkaoG5mY~AP%B*%J7HayfKKZX)I0wvs^KrFGZ5(Ucn1)SNr>k}&7=xu#(Jm~ z8-*I!6jZ%Mr~#}(O=P>xKZ=^rRZNfWa{_un#P{)d_plUd#1*gw)QW zkQdf}F_^d$$qXnZYQ-|6wjwX4!Ahu=>W=i|I=>U}E;VYz>rgY;joOMMsE)2-ZM=tx zF<)el_wW2QusHFhm<}IfCX5}$tZV_)gc_sTX^omlSB$IYe<%TU9FAJT#i*s;gnD6| z#uWGfwbYS)&CFt>1|Ed!AOos?80vHvv+=SRNW3oUeb5zEekMkve`f&!Ra}W0*)~ju z$59m?qn0vORC9=uSks{z%89C9&{`4IPD9k8>x5d-{-_lgjvC+u^#1;T8UZylA60NU z>V>o()zEp=4DO-cWM5Ekym-;fKr^6Ltc;B}N7WyKYIiYa#8s#jyNnvh{b(N7JMxz# zXr$j!1MrJ(W)u$x5>JiZGlJeTf-1iobw*C0w(2HoX75n#d_mQV2sPhhXFw9w#4;#Phh<#;5puyq^IlF$?J*P%D)>rb#b=!Ngmk z20jWkfa$1#E_7{R1(qjao%J*JC0;U?$NRax8+9gLU|sZ!Z8~a!n}`oUJ!YYC%;Q=D zwMDhD9CpMpxCMt{(YPL`6uJiqY$Xsqz|3$z{z?2R*2fL;%nHSb@A3W}KNR(XT8J9Z zZq(y<12ur;2|V7vjOIY?@fFmJ@1Q;-o}*^|200t9^T}p73C&^iMVq_QLoy+P_O7)s55cT`rIqe-+KZY>37s=jhfgP z8`W_jrp9!ry{&+nX$#b=v@fdR@u)*M-Nx6T4rv6c{R1}r6ndWm^#1EZL#z(gS39AWc ziJ~SmBlbrXOl;%ntT{1=^kO#N2(=RJQ8RQg1jnETumSbqw%z96M4f?0m=#|nUmhsHNFwGmfB6^BL3@J;6~}GNl>FNt{IdF3!MisXX45jF#HW&_%7_1k_oY zi5kEPR6pxcE8#{E&{v{^sK@Rb=Ei7g%*SgH)Rs)fA-D~-W%<&2ykD<3pa%E|A7Jqi zb7<40^LYQHTOALQz8uG5`}7{?5Prbgdj5B0@Hi19#Leh&zT;8UtM_mw^X3c4?9o3I zbc$g&jGV>e{WE%REJ^$_mc=BYW{+E-Ugg8E7)D@q{D@hwd{*;u-WOBq^Z$1OL&(^H zs!$-C$NNj@L8vbhpD-Jy2{TJy3$>&jFf9(is<;S)@hz6ec-hU_X^fePcSoIt1*kKy z24m>+f2&P6hyJJQEwSks+FREftPP2C*Sc7;@RQhPtOv6zFe}ow^AeYDc zwZ0JQ>6nDt>iOvERIehC0{5Xtcn9^4eu>(O_o#P%vE1hQZ;WcVKk6_oLp8V>b;!1& z5AMYdzJUstupeqSl(%z`2VHD=VN!S_>V;any*L-WOhLwr;$MSd_ zOJMwb9;Xu4Ma7q++Ixl?;5*a+eqb;Ls)g3tVQ?qZctV4ZxJ7r^QrQ2J5mn?QObyu$Vce53vFTKBHc>rHY%1 zwQ(o$zBm(emhd=J@DyrK8<+HW|BdK=JW0G&DUTEG;ahNNkMkH0moZDfww(EnxEiO?P;1<3_ozjyvO@XVZ!}AFB z^*Vkn^Y~>&J&qMn<=diGt|#j3jK=Z!3WIS#ZI81Y=i(A9QOCp|qpN}w>+)3#gX($s z!IM`e>Xp2qzQ^ehnI&&v4%dYy<}BoHYToH@aWCbzG&A2JdpGwu^N5GGFlXZwE+n3{ zr73p~b(SW#@;IBZVr$l49XoBz*Xr4*L)5XY$2o?1+nI`<_8w;$@%`9C#XESs|G@YL z9wk1Zqxn#&)yZ^_q_f9aMEVt+j(xkBLmR8B`4+qoyO5r-n`;kQH;?xp7+pghwo2Vi zg&U}NryeH$6*~~0(9`3Lz|S}w2lp}`&py3P{utB?>I25$DJa>;L%rDc8(rr(0ljd}+l+gt=l2=v4d;w8 zMn?@K0M$SUs=-jy<68{9-}P*MC)BI97pk3sm=#B&o}LJduh0Jr1oR#5F{;7Os1GCm zvBspRjx$?}qRQ38AZ&wru7{)Q&9V8bQ4`yPDt8vu&vP69j*0dBCmv@S%z@q)1m+{X zu}%LS^}<+5o1#8;+o8S#&Ov?qU4~kzL#P$Jfv!e;-xhd> zYA9fWnMr2!CteVPu^ehI+oJ~5#pVx2tu19@Oc!qkBC75X1FM%rGXd=(Q zM%s;pv$zEHZtgM3%wPsqA$|;FV4}%prP83{c~CPhff`Un)XW;7J`G!72p&a!mb^j@ zF!K~szu*)eCmpu3B+SCbxEVj8FQ=vOP?m!LXFzQu( z2DOq;F$G4NZdNcg>MWE*?^d}4Qj*XP^`aSvsWI^k^Tni)wE}9%>Y?_u6YBBmgIcjc zsMEg?lVJpEg)XAD@HVQ$7pQhV*nBtoOtT~jPzBSXDrQG@P#AS6OIjPEX4n&TnkS(S z*CN!??!#Jm4(nsc?`DOE;w|Dc(fe4=^7iLC0|}_&7%YXeOonqCHKP}(J@w2sD-s=p zi3g(c^P*Oy5^788*z~T}k*FEZ#+4gJ6k7;nD$dEpRtAnv=sbkH5O=QmI*_Z2n3cngimQ169w=>7X&UIJQ@@~D|s zLmjGmsI6#e<6Ti_WdLeG^H5v12GzlK>p|;jRQ;={0o_LpDAFQxMuN~)LOudIt<^9X zJ75kRkDBp5?1Pt3VUnE+i2JE-QEPViKBAHMF%Z_!h2x=fRQDdZte;rZ`K z;1UUHxY$zjyf(n}#D}5Y)vHl6Jcb(31?wYJgI`c9;=jxoggJ?4wDBgWa-C62Kg6a_ zS?1cuhJ-w1L||roiOn&|a#LXt>M@&$TCt6&nIA_D>^!Q28>mD05_LFzSD11^s4Y#6 zdJIER1IgnO(2UBWo`Qy`nRK)T2H5y`n?J{prAR-nvyXt5>I62!+csWol{qxEQ3Gj?D%aaO4mIyTwWgg|=>7eFS^|1!hoWX$5mm7%Y9PH)OFG1+FFe|;-GY74$V#eFuInWsa|Gz_(*#ZXU26`S4| zHIvS$t#UC8m!l5fHPq67LalI|jpp$VMQufcjXeKaffgiaq`gri9gpg832F;A;#k~? z8bIkyrd}=duAFrs>M@**`EWI={zFuUuTkYcqRvzdce6Rw2~h*cgxQZ+y= z-Eh>>PewI37qvo5Q3LxEHSmL|8J|b3&}&q?&Yxy$qN3V$LkOsW%BTX3ZM+p~PkW(8 zJP9?xC8+NO+im(@>_hw_>WfQ-2vfcbs@>tJEeJ=|UybT#Khlot93!BaoI$-Bub^gn z8&&XyO@D`4k#DHO8GDOa>h!23E`i#*N~m^PqE@OCY6beC4&_+X3+NB@{_lSd6PQlI zMbzPIx7Bns5!JvV)J)c*X0jW#cbBmj-oZ*(dzuoh~`j-r@m}Z5TA-e@o)SM zo9;5dyneEa=f5-weRrFmQuksb;u-dMyy?GTA>wCn9{TS!9j!urFZdI+l;=@fatDL) zIclc<`^?0WqsnJTHr4Yd*jQ6D-Z zZTd0Pie1Eo9u6^Tg@+t810Rjr(y6G!y3!?(g}`3)esMsJ%=eIqC$fg2wy3;~H%1Mx z530fOHh-~oi_Je_y^SjO-p2h7n*q5g2x!C^Pz~m?8Rb!rTTRp(tqrQ&FwBe-F$8y_ z4%Npw2kJ4biA>aWdJs^@Be4|DMjfI%sHJ<1I@PaHdl>zw zX)pv8FNW!`u}vRk(-&b)()VCmjCagzWj<7YjWM3S|MwuEhJHhB!BW(WcVi~JhFXcp z$4z=5YNpvy11*SpKa{ZfHBbZZjH=fgcjFk$h-FTgzZZ1JQhNRm5>SWHPnrs8Ppl$k(9)Yi1Z88{wSV(Qc8(4In-zl`3`|3?J$%KeO5 z3EwmPl1LR$k5yCDUUonYsEE~xhAquN=A zI{n8{?Y~BCMWV}QW!)+Sw5RP*kI?{B!%I*ru?h8NJd45j5;e0}SIkezsZj%Kj4Iy^ zl|KM&6>G{7!U^EF&upM^$%T&C9dcN^E$T2wyJ40*C8~S@ETZSX6akHVBEEIq11 zUes1pMV*bhsI3};n!!5M0JotUK8PB?RqHcU{qLwHkMg%UTX|6vEb}+dzZ$4Tf@abb zwWsY+>Ag@54ncJgjvBxURKu68w@@qe5H&EL+vWx2k7_49s@)u@dPPwEmAUPjhO3gG z$E+o4uSTPmXc4M`%{IQr#?PTv?gpyCdp7>e#^0b`OrKF5C%R)ygK94u>QEPO320Bt zVlXzr>No^7^NZF;s0yD^XTTESc z9(UL2Nk9V_W1Wp^a5ZW#|HJ~g2Q%Uq%zI`f|9p*Erj^3kQJpK>O z`=tPCfK@Sup8w_qG}F$gJsW^ps@bT5$51o5ZsQM89e%`2nBqu#Km(fhyuzezw#^cpqeNRQ3PV`3K%GsQflPk&;T{xoVpH&A={2z7WpPt8iE zMV+18s4XgowXhnh;}xha+=6a-0*45w!Pw8t5+ySj#|0Ts1BolHUp23dMeVQ(zBw< zxZceKsH}lGUi|L4G{B90mb<`4eN3FzM^uAzF z1HO!!$Ya#jd_xVu=RfmpISfYepquv82@GM4;!YoOO1N&v!VuE5OqeXqPC)*P49+0na)UL zrCg_fG#~F$O+tN2O-H?FtU$E(S zPy>CAIy)aROvf;qpP6}n)QhE_wFm0-PC(6ICTeEuQ7du~HGscR1GOopV0gBzi(_G?^mkCsEkUe$FKqFdF_XKO2(j;ZXIU9 zy{JR^67>T5fqGhero#{TT$&lK&{-{I6nORN8l?7YA7(S*@6tHB`<;5 zumNi6#-k4BBGhxf-^L%J-UCqrj7d=|k^@z*GOC{zsEN6#r)XY)>*M_{w}S*VaLfAM z7Kjng%pg7LQ!X23#X6_~|AsnLvrsFw40UEAP+Pj!#!sQP;0gxgL+pyaZhRl_zvJzL zTAHW{e7s+o65s&hbFn!lN@yA$U>%8Cp-HF#tUztSW>iNzFfSgrai2i5HF2>t>G@EP zyE}xyC;|&`IEExLFOXGOpZF7ejwKTNc>hUeR{jq?RwdpFuj3XRf>VNgoL3l-)W`eR zG*2=g@4pvpjY)Xk|HE?RCr;tx{a9~-JN5j}BhZD6dcmgRaSS6Kn$pK9hD}kA+hWv* z)HckI=TQUkPvzr%B{xFt^>3)XpNndDD;B|YsePQm*ao$Qk1$lvf5J3oDNCXDuo0?2 zCv1)LP=_vZTJ!2mgL+SN!%!TD-X%wE#c>Az_YxsDTdtCRTi8c6sD z6+Ust=PtnKY7`1-=9{n~`Tt=o8t6p00QWrZjKuls=xitNo^6bv6RiJmRlvivmzc5_ zh!?i$1ae@+o7vcUkuC%tK=`EQ~UjY8UD=lfe$sa~~ zJ~}LgONjrx^is+m$@K5Ew2f}~nTy@2RN1jcTUnCkfx97VqN)9Y9g)4s7J;T?&jRO>Ra>E z*)7WGdPX^2@o_Qt)bQQ)g51{RcBE7oL#<3W$P{v75cZ|ipTu|BniXxUO}c5+y_*K_!6C>kyPGDVq+5jpzs9l@!V-`XQ~*5 z@H@&3CES;A5Atsk_uyD=U89JXBrlM5rg8V>9!fk8{=Aymz(rffdx}d?prB1?g2`=# z{ZzjDzk-}9;%kUMppo?WgL0ekEa@3YOF_H>_j~S_45qB@Y!2Z&r0KivHk;OrwB+30 zr|1}sbfS@7#Agt$L|E4@Ya|NlRaTM)_NpO!H72c%4L4F_T-j}Y1rz<>e?tiU`Lizd zHc@^deYv|xEb_l%|8F261%6(I=)8_?V9_t>k!dJD=}V9=3f?Oj9poWgnsNgO>pE@l z{x1twkynDe-TGm&I1RTYp|ve=l<+Dlh0$nt(pI28tjki4|L47CQASsKgR_D1;e_Ma z0+VTc-!Fq4Ncq3H6WGCQwDsQV|BBBX5=)cWheUpz?mVHxMz+9C(jRc^8cBoGaRK>J z>4|GRn+YDv1TQslKG?>pi0gdfmmB=YpBqfeN4@i@0joioJwn&K?tu0x%3;rkoKbHCeGDdhdv>vFD5 zJ41LB;WGFemasjm%ud45xJ%Gdb=&(4JV@^iY`GBX6d_&)8&gi#Oyattkv7?!ZXO6K z1*0)Tdxac z_>GSfEj+AAJa;1{Q^Yk!Wxk zon^%P*o*X}gwxRAOv2BxH1Sood^#LqJBp4+$p3?OzS;pVAfA}=B_r{{FqBA9B1I_} zMu9-?aismc<`REw8!jFmvqhlmPwc%-=|OH+?&h>`l(c@da*MdG#KZ>@E=srn;Ue5O zXgM}zc96Ch`SHnnEyYLN4JmWm)>lR=!qsV8*9P)?>;G=$CL)ixVU>GJJCkj^I^|B#UO0D4eQ(Z6<}4ETQm~Rr zbCsm`AvqCm-_>GXX&&tdDjRpKwZE|isR@n3xdJpX8&P~EcTZpLl zic5U4Ox>``S9Jj7Mq>aVyHeQJOVT3z#^E)GFIQgw?8}%qxjk_XK;+G>%3GO=N2Sw&r zIDZq^9$u(zkeh^LT|;mxX5o%Q75)O`oFwfqwy>*njrevu`;o>I&bK87y16g8&Y?iJ~6J?LaH~90*;Mu!?rX&lcZ0iKU5yqR&0(tXk?K$ zg-4mjP7xns<2`<9a~gT+$kVThzo4$a|Cir@&k+*#+6-l;C37ryPCIL*)g&B)hN{?# zQ&GRc`+5CF{4tRplnKV2402ZZ#&+@C`h=>HTiX`RNr`9NKd-;Y-%6wyX?M_vc!13u zOn8FV8prXBfct#4)9KyC`YwuO>WsI3iqTi`zf zxs%cP2JVlxVdeeMf4Dx9K7zK!a*rXusBJfx@DK7X5kEk=3xqS-y#D&FVqqecDD*cS zHbp<;{0`blNj!+c7fGu}JPo7HMf{i@SQTtbJiVPwbISaB%_JVp=0&BAca)tN9@ZhA z8)Q>|mTo}2imiR0l3U1FMm(1-SCe=y+pFqCw&@c|^AOJTOP=yaazCS;4ctF3em(ER zH}za6I)UP3-eE}NsT_*!?EuOWuFM^k^pw<2L%I3nbs|mIZ0>}l<+kO!+0HxD<^a<2 z67NQt&xE^B?vX0}a;@Z7vCc~}e!V(SdA@BZv(0EqJQw8#ahJDw-xx$;^4}3JU@mosU!3)xUy^7FL-Cq)p&{jOk^rL)5%&$24Zfz3o6Zv^{CESn50n+2r@l~6b zKyp{5;cPSzLHIjms@VL=lpRPo5$ZZjI00^-vZM ziTGK6VrW4FZ@K4DU@-R{!dobCi}25DEb-pN0~vs>!`y$^{5GWJAiRTm&AIo{$t=qM z6@IsSJU1^XHMn>D(%Jw@45maz9AbyG(3;oUg!1#~r5)v_aqF7Foxz4Dc~i`PqEIIf z>91`c_iP(6^h=`Dbgp;`GS6}sCBBY(3>DfCuf%=WR;WQ*bnXtsuTdrqcNFr&a02Q5 zluy`?d=Kfp?I0!){+&B1x2{9nLn(7e&({qqwPuYLlDUeEOoXpuA_}Y|uMp{(Nn1rc zn0S5c&;1)^cHpm94$8%&jILpLmi)eiPZAEdo%<5sXUojj^QEf@nRiJnNCkfyDML5` z;n?IoWk$M&U}Ww=gimot{-yI))GtMynA}$gN048Qc1{p3M_OFssjvoVYksMhZyAv! z+_fmM2T$Tc?)BU;xChW-Ln_t8*S2B|;t9gnI6#Y*{LzF)@zxKiwm{O)2n-0yjuKfZ@b-bs)Tk`z?10?hD+F z=tNgN8g5Uy=fqo*UYPq5@f+NOZ5fq|N!X9F=dm_rMsv64UPoRvGZ@z?LxI&)yv?17 zjMWr~M0g!m!uh{6xZlnoCSE4Jpp74(Tt)8v+@YlH<4#DsS!v_vRfn|I+^4xaQ};P# zy}v^#Ny209_uR3__(H~I!kM}A5pTwwi||QIK%>!Yi|c=BTuJ4~`-3vN*5X#`Was{a za@ok+v$;{vd!;tl+A+BQ)>64VSz|=bnLjMs*1knO ABme*a delta 30063 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 diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 2b37a592e..4815bbd71 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-02 04:10\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -54,19 +54,19 @@ msgstr "SlaptaÅžodis nesutampa" msgid "Incorrect Password" msgstr "Neteisingas slaptaÅžodis" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Skaitymo pabaigos data negali bÅĢti prieÅĄ skaitymo pradÅžios datą." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Skaitymo pabaigos data negali bÅĢti prieÅĄ skaitymo pradÅžios datą." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Skaitymo pabaigos data negali bÅĢti ateityje." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Skaitymo pabaigos data negali bÅĢti ateityje." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "AutomatiÅĄkai sugeneruota ataskaita" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Laukiama" @@ -258,17 +259,24 @@ msgstr "Sekėjai" msgid "Private" msgstr "Privatu" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktyvus" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "UÅžbaigti" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Sustabdyta" @@ -284,6 +292,10 @@ msgstr "Klaida įkeliant knygą" msgid "Could not find a match for book" msgstr "Nepavyko rasti tokios knygos" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Nemokama" @@ -359,7 +371,7 @@ msgstr "ApÅžvalgos" msgid "Comments" msgstr "Komentarai" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citatos" @@ -972,6 +984,7 @@ msgstr "IÅĄsaugoti" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -989,6 +1002,7 @@ msgstr "DuomenÅŗ įkėlimas prisijungs prie %(source_name)s ir #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Patvirtinti" @@ -1492,9 +1506,12 @@ msgid "Domain" msgstr "Domenas" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1506,7 +1523,8 @@ msgstr "BÅĢsena" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2846,16 +2864,16 @@ msgid "No activities for this hashtag yet!" msgstr "Å ioje grotÅžymėje nėra aktyvumo!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importuoti knygas" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Netinkamas CSV failas" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -2864,95 +2882,105 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "VidutiniÅĄkai importavimas uÅžima %(hours)s val." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "VidutiniÅĄkai importavimas uÅžima %(minutes)s min." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "DuomenÅŗ ÅĄaltinis:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Galite atsisiÅŗsti savo „Goodreads“ duomenis iÅĄ Importavimo ir eksportavimo puslapio, esančio jÅĢsÅŗ „Goodreads“ paskyroje." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "DuomenÅŗ failas:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "ÄŽtraukti atsiliepimus" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Privatumo nustatymai svarbiems atsiliepimams:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importuoti" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Pasiekėte importavimo limitą." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importavimo galimybė laikinai iÅĄjungta. Dėkojame uÅž kantrybę." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Pastaruoju metu importuota" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "SukÅĢrimo data" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Paskutinį kartą atnaujinta" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Elementai" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Pastaruoju metu neimportuota" @@ -2988,7 +3016,8 @@ msgid "Refresh" msgstr "Atnaujinti" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Sustabdyti importavimą" @@ -3090,6 +3119,133 @@ msgstr "Tai seno formato importas, kuris nebepalaikomas. Jei norite matyti impor msgid "Update import" msgstr "Atnaujinti importą" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Nario paskyra" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3110,7 +3266,7 @@ msgid "Reject" msgstr "Atmesti" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Nepavykę elementai" @@ -3900,6 +4056,16 @@ msgstr "pakeitė %(group_name)s pavadinimą" msgid "has changed the description of %(group_name)s" msgstr "pakeitė %(group_name)s apraÅĄymą" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "IÅĄtrinti praneÅĄimus" @@ -4143,7 +4309,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Blokuoti nariai" @@ -4278,14 +4444,66 @@ msgstr "Numatytasis įraÅĄo privatumas:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "IeÅĄkai privačiÅŗ lentynÅŗ? Gali nustatyti atskirus matomumo lygius kiekvienai lentynai, reikia nueiti į Mano knygos, pasirinkti lentyną ir spustelėti \"Redaguoti lentyną\"" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSV eksportas" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "ÄŽ eksportavimą įeis visos jÅĢsÅŗ lentynose esančios knygos, perÅžiÅĢrėtos knygos bei tos, kurias neseniai skaitėte." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4303,11 +4521,7 @@ msgstr "" msgid "Data" msgstr "Duomenys" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV eksportas" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Sąsajos" @@ -4801,7 +5015,8 @@ msgid "Active Tasks" msgstr "Aktyvios uÅžduotys" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5203,9 +5418,14 @@ msgid "No instances found" msgstr "ServeriÅŗ nerasta" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Sustabdyti importavimą?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "IÅĄjungti naujus importavimus" @@ -5218,70 +5438,107 @@ msgstr "Tai reikėtÅŗ naudoti tais atvejais, kai kyla problemÅŗ importuojant, to msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Kai importavimas iÅĄjungtas - naujÅŗ pradėti negalima, bet seni importai vaÅžiuos kaip vaÅžiavę." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "IÅĄjungti importavimus" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Naudotojai nebegali pradėti importuoti" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "ÄŽjungti importavimus" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Apriboti importo skaičiÅŗ" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Kai kurie vartotojai gali pabandyti importuoti daug knygÅŗ, ko galbÅĢt nenorima." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "ÄŽraÅĄius 0 apribojimo nebus." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Nustatyti importo limitą" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "knygas kas" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "dienÅŗ." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Nustatyti limitą" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "UÅžbaigta" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Vartotojas" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Atnaujinimo data" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Laukiami elementai" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Sėkmingi elementai" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Nerasta atitinkančiÅŗ importÅŗ." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6094,17 +6351,15 @@ msgstr "Sukurti lentyną" msgid "Edit Shelf" msgstr "Redaguoti lentyną" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Nario paskyra" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Visos knygos" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importuoti knygas" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/nl_NL/LC_MESSAGES/django.mo b/locale/nl_NL/LC_MESSAGES/django.mo index 2c66d828b451b562d2bec7d4c340e9fb642c38dd..932021e43a4544dc0c7eb07911b3ac9a0dadfb23 100644 GIT binary patch delta 35946 zcmajn2YeOPqVMt9n+~D(zL5?g^eVlG^j-xaB%2TjNk{=Hvgt*nNeNXtB2tt9K|p$w zDo7DUl&T_#U_nIj{r518mxl9VsYAcN>4I9Y=PN%Fb4DE+vvl!*cp#v87wf_jGz&=B|Zj~ z|5L2zahw~Nhj@{xj!z`k7^TC|pe4{;g3x6;f+^Hs(ZIDz!G zs~sl-&tVg+y~c5d<47EbKjU~D#HDa2d=FV2$FqZJ#PK)`pJ4|ax|4STeu6rd-(fn;#(K#-m>UaWdJMsg zSQE2iL(HHS+S-J!sEh;L2W&W-KFp>EFo@?oB6_Fx)3f~D~U=E9#) z9rCcTGGks0(g=M7RIn0e!djRe8)G)?XrK4Pyu=4#aU6@P@Lg27ZPvZ029BXddLGsB zZ!ibmxBiU*70kv?QbPr>ES5!er~_ufp4bb+QTg}T^b@F=xQNPs7pvk!)J&G(>}e^> zp&D+4nyHScCF;4G`B%?gCqX?Pg6ha{n{hI#;+a?h7ow*2AgUurt>;iPb`@3M4_Fz0 zM|G&o9`nuUiJHL~s3lpohxxBbU^@vMUFRP9aOPg~P1u6&=|EN7^b_-n?tq%waMVcS zP#qtM>fkgSf^TC9`~$0Dp?#)YJJd|P79gO4VW^SDp++(q7vKz3$4cyXoF{k$IT+5~ z17-$>9W+Zc8r7kxsF_)S>evd@NY|s<`51k80!v`v2Lc5MWI1GdR0=gk!5E88u^1+! z8n}R3%WqK?KSGTp?O|>VLe-ZOHINFZhU?kqtx$WaJ+cP^PHzI5+Wx4DhN2ouL~X8# zs0tQX*PzDk45o14#mH)HV&q@>dc52nRrrX& zHhhlF@S~F)N&F4_Vb@b;3b&)C`Z#KYUtoH?j_TkY`}{ZiJpF0&JP0%JJU42S7q*r< z&HU#fp%Mu`Y>Mhx7-qs@HsffUKFOxPgQ{>DYR1;u=Q~lG@`#OJvCr>dA<~~<2Z^Ik9=D}yTc3ThAZMlDGws$-Fu z6GvF5BQH^BDJp-@&)t~`IQ{YRMX)_E39N$GW246XEE7|CbZcE`1L*l8;cE@Do&lZ?FhH#NHTm#WWOw zYA6Pk{|!_Jm!QgRKy_%BO+SF@&{@Fa^q?W}psgs=K0Q;5Af5gHY!< z7FBKrYH1duW@rOy%|F4scnCGKU!Vqd4^`jqr~#+B%KR&k^{Sc5{HXX#sEoljy{@&n zwS%=cDxV)U;y9Z=0oCA4REHO11Kf^UipQw@e*_5RCXn$fzAXp zWnrkb9*L@GDypJ)Pz^6eEy-pqh3UREGf@FGwT)2qbU^J5KdRhV)BxT=orWc-{F~4{ z|9c6jr^iq|ypEc>2dI%gL8Yg;VH(JVs-PUI;yS3cZ;YDSE~pXqL^T+S>PS4QgHurh zTz-T3pG{x`30nI)H_Z&RLXEHos-ZEc4!n&jxDw?EM|z8w^|~5J8~$_vUxGreYIi#GY8>2lLx(i8zP&ZcLAD?wLK) z85JLF9fn%UH>}f9dus{mv}{Ao%zosB6>!cF&?dQ!8u9N~7`;Cli=p;FJ=7j(jcTBm zeLfhQ6Q6<^@f2!PUc`oY4K+iB@0+PFjmL;rLHGOrgn$aBd0?hA2(=`+Pz{$x?b@0) zy$z}(uiN-g)b1XK8pwRqt9U(T#ZOTAPobWFY2)|N{rUeH0gWi)xjaCJu@0L@;O)%7hzf4iyF{v)Sh{Q8t~s3(B?}2&@`CES`f35UKW+H z7G}prsHyIN>ezhDjPGI=d>?~w2Wq5;Fgsqv5_lU`F8$9YUyh$y|MnylC80P*q1OIw zR0lSoDo(*1co_B3xrkblpHL%B`^b#29ID}$QA^McHNbFGJ&~yT6K(q3N1O@ucp(W} zaSay3E|1OcUdLfC;`>k|E%1w(sgkG;R<-fQsCwF?rua3?jiLB5CZd+;Bh(BW!<_h8 zfWS)xZengs_bWfqVnN)3Cs7rS{LPFYfNFRKY7Zi={vGGT^ zm-rJ@hXdPxH$6Lu>d|G)f!|{_e2TR(_=zbHjv>T{p&D9=Dz^a(;cnCvU&12z2>W8T zKg?c=LhXq}q@92>nLtev7TOG_%>(BW<|F+ss)4`l^XyN}W-5SM+j^*_X@r`=)~G3d z9dqFz)YOm0NStHie_|266SMzmMiy+Xi#mR<*mze|g`ub^9fBIsFdILIT9Qks25+M} z^aRx*?=w?hKGckqLevG0_$zAdgZ?%R6h&>SDmLB$)v*Dnj!Z&z zYy%d;U8oL!j+OBaYUc7jH|fQ#RZ*L=*>mRKN1y`i9i2#v*AP6&7t@$EU&o`r{dWVhgv+-j#ehyXd6;#LWVrl%{J};79^|1b>2xtVs zs0v>}jkE)*r=iv%s1YZkcJCO}F`R~_a4BjNA3!yD4fP(lkIMf9RbQG6rk<>rnf9GL z1Tj7&dZ0EVcYp@#tZTm;on zLv%MYY6&`^I@S+0GjmXTF0kAttU=Adhc=#qvxpzTVC<63R6Nc)4b{OpSRB`(Dn5#O zUtGX6co#e2Jygf)XEz;dj`eBZX-7c2@-0-s*{B|`LG>^hHR6x0M^O!($B}p)wP$+f zFf%t0HIP_Tz7aSYC!vm`lhf3n1#{~B7bf5%y%K8e+q(}~W2{4b9;%|#s42gS8u|CA zj{S{VvP`*5{@hrdcw1Dtaj0@LQSX&ys19$z+&cez381lDcBqEBp{9HQ4#k0}O?(mcet3eaH)9^N1f?;cDGwo_-Pjb>Kwk{T2-K9# zM|ErkYEx}Rbzm22B**RZOQ`zpppNrX)TVnWuUX12s1EnChUVq`hmjCTg5FeTP(A(D z`Uuq_Z$4uX`iSR4b*wgO=9;3Gq&=3xFx0z#8mitcsD=-sI{YbWX0PPq{A(oFNYKcB zM6J=UsD{($_qcyKB?syo5rG|XJT}D(SQhgZFkiO@s40&`HTX8Fp82SbzKa^*MpQd{ z0tD27Gw7~8YANocUNjjBn&VXrHR6V-idvyY(hb#67^?gb)b1Z`;}cNd{dZ9Bk&USQ z=TQR=TqU4_H&H!%Y%`=OWHM$!z2S1BDyWL;Ku^@B3%3qKRXi3|-xTXYRK4r%^AuFM z{YVD_&S?UgqD!cre`Di!Q5F7->ggY-H=L)isjwt!WHnH4#{S_PWS0kzg|Ta&N?@zto!bq4jK`We;HlEpkuTda=ba2(b} zPjQcP9$&_CnAK;}Yhiifu^6aCUU zZxH_hLvX-L9``q)=3)clcTr1Is-(yLy``olIsa;SDGA#!8Fh{amNMsdGDZ*S$L;7ToIw0Ow!oM&9`~>9>_E-L(6S!)PtD)M-o*QqGc%b|j`Kf^gfB_Z ztFdi))5A#A`JRgE&`Dg4-=Moh73>nBK2k}jnOTn7Tx)ImCe-fVhB`Heaj}OV=TS=+ z83;CSqLJ8*gt6EaFQPV4`AX)+QwwVl?}&QGPe#4LrlU6HENhZ=C90$EqdJsq-GgfQ zFltiXclTyCE54})LMRo z`j#9XHO+l!csDPU3PN+@!dM(bs8Xjm9hM@|ML~WW0HhmiE^E(H%b{laD zrmt-}G81PLUxQlX>UGRao* z$1#mO&JO$>|HkQ!&AWYS6Z1;Fh=)i|)6~4Uj^XRX>ooJYzcrhLuM)q8!?1L7kNf-o zNvJi?)xvx`s$y~Cfp7v%2uwn~YL8(hEclAa&=N}!kHB#_9rt18mZsdNIEr|dSItjA zQ?Ls0ZKyqR3pM3Wu{36CWoEK6`gH!s5opbWRjAE%AA`|pZ8l3K)E=paT9Otv-U;>M z>Vv&-9LC|7s6EoIjVbp&YH7El2670s6t~^yoWDA4&B&W!MIJ1~3d)F`@B!*rHEL%% z&>l6i-l!>zMeXW2sD_rKj_(K97Pq0kE&rh28%5fi`s<*3{=*1pWRa*{nTTF|6RYAl z9Dv(U$1!gQvuVp&Lr_y(19f_uqc&qZ9EcOK6yC#fn7yON{ayDu7|_&DCD05nU^~p$ z$;87^r(*-E;w`9-rl2}<7=3sdHS#Amp02YgR|Zus7&Wk(HoXCArki!<{P!UcV-rr} zJH-D$6`awvGsR=DKk~bvMVN7KRazM5UiWjr1~V^ZbA>VU`{q=b?vRIpGH4#d?{UIF4J1e~;SCi+Y>< zn^5s{s2ABSR6BnM2vj2w`kI;g`PQ4L7g3cy9w#0nQOE3Se1<*yQXw7a`np+?LH$ez z60kbY7vQV-De5%k>Td?p2=yxNjI}W^l0Z`eA7N+w6}9PFhMEdTqJD&0g8BwrME#ub z18OEb1I&x76zWYm8rASN?1s-!BkmN&X`;hJQ1yHg?$IA~1e^;5RN+LwIZjJa=XVdP zf&2qakL#iGgdkfxbK)J;uLqu>j%khvb9~F7X0#?Q$7po_{4Z#b`J5KO zvOFk{TJuh*o`<8(?O4<~UxMnudzgr)a1J(!G;g>I_!03xa5HWkZ1zOYA?72MG0OZb zxd@-?`~UJ#^V4a~XwI#dbBd9q`-XX(6ZjVHz%Fs-C!tL79{p`fx`qAj`TPOu=gnQaVb37-Z+= z6UUeldEPYd{$$)kdfZr#^9hCoJkBb-kJEA1IAekF9%lye)i_l7CU~4za2cxJTN60{ z3kZZxG~e?l*0Ga3?%#e-H`)9)`YfD9zNgk{Q%pSnRP)YXkNSERoW|0z$zt&g@rlzt zP6RXB=`GXn$8USwKNEIldffL;qnY$LfsD&Y7>qe*nR7V?!-;>31F^+y^ZDI`1Bicx zeX-#jvlo_OKH>*(EM7q!>+W;SZ^ceW{aW!T>MPjv9bUn7bWngmFA`GbnV#jG?{QiZ z?}#ID5o#~wT3~+VGX}E~KZZ;2B5DR>7MdAMmtg#8XwT{Qa`uYDI0%~Xr7Q%z52CmukU##hu+MkS29cqbru{-McMWJTy8fxVCQS~^> zOnQFQ3#cq=2K!?%o&P8Tdb758Z+W;RK5pT3!k9YHe|V3 z%Ic_w8l&oOi>fCa>tQ?w8WPw-pb1R-hw5M-9F3tXIsa?|=W7yLVCGe(f{v&P2iW*f)JOuTrJ8}; z@m)NQT~_mX<~S8z<8l9PM}xIyhSIJxQ=b*JIg6s|sfe1%+Uq#~TEm7UsE1v#1csqL zK9f1kQTf-QI=mURvN$wYcglLhrU#x7&{xj0 z!8A}9)seEOhO41=Z8Ox1Y7DC3%XkX!p{8=@`(~;?L5=JT*2SBskr&x$_QXr5&0861 zC*af}ps8<$TBFXW-P|9GViIZuJ5UYpNB2czy7UHhvaW z&lS`jxM_WgsxQYj)6sGmP>&lB(1Xs{6$jf4`%&-mi#QGMqB<6nY<@v88kZ7ZiP{78 zx0@wuh8j>0)aePuFnkj=qc>3XJl@XytLM*2(3)o5VRmt097a3@)v=XW3U^@z{2KKl z%DB@s9E_@`I%2HtG4Sxng~Y zdevswYhO^P2CAX*H%0CCemDzDMCuZidp_ZZuD!mkD*Z02?0UehHZUV;-YZLE@ z$~Xr#LyJ-0hRxPMPnk*tgdtkMFuo+eHQPifqjH>W4zJWy!n_reMKsA`@i0NoB>iy9ewOMYUX~zR+#3P zsiz&P{_Zy37q#aC0}1HZ#G!gV9aZ6KR7D%H8tzBU$YWH)X^xwYUjgy zQnf)JzJ@A426YN%A~PFsk_hPCo{U<8FRZt$KcUv@DQe1co-k8g3N@lSsHts)y|EK& zNj9PKpF?%%CaQx!qw34>smgKwixbcYs=5jMFBw?d*z~?O?nh1W2%A0yHIiAVku5^a z*!!rF??Wx&SyTtFpgQ~mYU+PR_uv2gML?S@`$^NYil~a3;X>?*TAGKbkz_n&8qSAm z$cGwf71Rti!&q#OEpfk1&v4qj^K+ql>@lF81QSrjbx`qFP`@tdjLJ9{HACxgB5p=) z#;Rvb{+6hQyP$sk@H(!-H&H)~7C&oFPbt()wMTWl-&xMTzCtl1sDecMU>qua4(g+` z5WV;zY7LW7Q-2cGz(v$lU$x#umH!cy?-6S1pV@TpIrG=@GM?l7>vtjslQ03l$Ei5v zGxK}Dzu++9EzX-?@26k~;(0Ha3jEla_;F0ZLZ6$Nx`007U!q=I&rk!*c+o6zZqy7` z3=q(HZi1ScKBxjiQD3!DsNI@`+I(A4yL%s2z#FI~3c6&T`%rtKGHNNBVjPB|miQuS zDQ}{dIB?Gfm5h!xK>D7TEY&)MidW z$ygX{H>!4<)gS9_uB*Rc^8?a7Cm79l}>eZ-*Hlt?v zFsj^j)X$Fhv7F9-j;p4Jbx|X1kE)<6s)2s?c_gaBv8a#9eAH6ywCRUYd*Ldop5QOd zrmKc(xGrkuTB7Rdg?VV-i6KxMC!wZrFDm0XY>PKgzY+@h%B*Qy)RYcEjd&a?|7_IA zR-s0G6l>zQsCx5VGYywVEkz@A|NUv;Z}*6{zF93$>J&P&4^UfWYena^E)JfH>6D z%(AXUozvZ@seFo>q4amm50!aQ6*oXV?~Ua#0yP73Q5{)=I!$YBe2juOzwu3YK0-wTV`vW@d-=C~EIqLN$076YwEwM#H}|Yd;uus@_1=HxcPL|Ne`B z)^-!>SnWe?l5bHJevjJ4k5Ku_esBM>Dr%PxLUn8+YU&rFMta;nzm8h6r&t=Z{a}9W zR|DPO{~tx5A`hlmw_ynJ>sTGL-m|Z0RK1@o%WLOncufMF?t*JE1!GI_mjM)bUEO9z`|uIqEq7 zh^jB$12dy}PNEQfYE9GrWd7_oGqxn&7PYqX zaTKmVz1RvpH076|8eEN9(oHxPcRb|$`w7(e*;Kd$)xb4WgEvuMyYEnIpZSs5d__>3 zHW)Q?jZxqCZdf1tU@KgV+HAK_Gw=|b<8xGpnmxAXzujYVjC!F83`Z51fI5zIQ5|>> zi{Z!U!!PXfr`GJhnEa(tBYhe50&9+{ZxCupMxZ)8H$b2~fkhaMhfoC{TK_;DFVC-L z#JNz%uMBF}*TUM^%03^D>gWPg1Mi`ha0_aQcG~zs)Sd}^N$_qAFaDYUn-GNVeJdVbt+Gi`DQutcr#HFdc1+%KsW_(?%&>$7DPKH8=+~ zWs6ZG*oyjf!5-A!xPm&CX`h<>Ijw~-mh_USrJIjxXep|mO{gW?g?cZXLe0o64Csya z8v$*qpg&Cqil8!7Lv^eBM2)QYGt*!V)RebGb;ys}tiw^8 zZ_6{zzt(Us37XndsHwe#+H~JyMf@9eY|8&-M$`;-{yU&%CJgnSn1h9AEQQc2p8h#sF4qTZU(T#x)!w; zwxAD>qso1c>iAPkgINRrm_H`ZiCWtTR6_~a5Z^@Y`n{;7I)duhSE!l#5w*6zTQl+N zB*ly1OstHm_Y+h-Cs9jz0X0zm_XoW0@9ln%YIvB(6c~l7Xew&zmS7XyYtx^jj!{mp z$=@ASVHj#}#G&e2h-z>J>eaj+HPg3{fdri5X}s=~R7NdDGt|^|v+2<`eFExq%*Rr= z5w&N|VHv!N+U-tS)1e?#!v#_4K2-i-jK^9StnugBr;o z)MgolYIp*=Yl&)b1!^ik#6GwiH52(Wd7S}R3mfBN)ZY0LtKwg%r3%UHbvJLf%wF@q z|IwcWt!*@_!AaIdsF7~6&ktj9;#Y0@Q`C~>$YLt2ff`67)YP{@b^JBdW)4T~i4mxQ zjLi}-Q$CvnZK}1Xk$;LB;dxYtzCta{L;E~!kjWQ>>QEjG#u}*np{V?csHJ%eRqtZd z46m{#2MDMqM{S17s7-VoHIg4~{0XWXz$Mhrf;Ume zxo>uJnueq5n}f_$fPd#>DoC*zPN1ghCTfKDP;2>%jiF0 z@iZ35Z>I7N>a;w^{+OqLS&BsLMtml2##^Y4&n@V6|73{|09=ZbkRc|HBG< z-M?tG8g+h$6frY$7N-$^hI+9~Dr!2k3cC>BkNPa;?*z`C!A6apO;#CoygH(0 zUC!>~Twsjq{%bh*;`8ia>S5e3DZh(M#{I|{EDP?wT7S!=7f~uefR>W6P?}Y@^ zDH(_Ra2o1G)3UT_pgZ0q9)?PPrHru~>NJI;IvPkIaGAhccosv;dfngCsZ!32Xff&- ztwBxocGQSJMZE`Zp*s4Tjb|?Rx63`~x zi8|L8tdCF~$q{U()Q1{DB~*G7)QogOjc_1pO5e2cdFZ}?Q2F(@}bISh5IqEIiKIMkAi#Ev)*m*8!i9tiQee@wp^H;`Vl zvUxRMNB8gl_o`wVjzEoQ7^=Z3s0L=C)^Y*X$M;YpxQ*rTA*$g5Rn4i1L=9{zPR0z? zyzXyg&cqnvUt%7PdF$$&|2ib}t6^T1i|{n@$G8Re^VcCSV010>3T;x`>;5+TD$GX( zz3P}3QEXlFPCtT&$^SP_!h`ipxmRBHx_<#-J+>e{bA7Kf7dzJH{7)fplLSp+WCO4J z+v*chdtnPUz%$qmvoth6`}IP-fZjsAA2#7zco}bDXd|!tcgI^a_BtzxCt*#j)5L7% zXw+U=A0VLJxz|3ph>665nwpMGKuzst)Y3dh?fTr!%pPfsIt}e?yq9$#mL@$O^~PL` zQ!!0*ulsAo8K`oBzX)iTW^7?bQV_cnZ-!dqCD;wup*HC=RK>+#F-z70Rel9((|(BB zw4dNhc;2S}YW1`lj=-Q- zP5LBMx#^e==b+C0LR9_lV`bcqer?m+1k{1nt<047z}CbkUEr z_%=*~B|Dl|XjxQ;YGEk)QSXD}sI|X}dZpe&jWByBufyqdPZT(88TabPdJG}Fo!AcS zkj{Ng@T*#z;VBQ22^Y}9aSf*z)3|?Oo_BMPb5r^Iz2sR&3%N<#%JYm^pZFl|q2%F@ z1)Tb%X_RHS-yqL7#9zF6Qpa9?|G`O1V{0hz4^Lm=-b%O(1;QvW2X)QE%ETw|?3qb& zDiE(n`ZOCKML0lRU67w&oc6euJM}6=xEAGKyuQ@`{?gyvdJFzZhR#$Fgb`Grs~quH zxmS}%R|NMa;`$*)FQ~$#ziFRoZFP;M>?YgLCFJP4*UvUzUCO6k+JDZ`7ZOGhUqFE? zbmDXFP813wu9p=1#d+z4ysZciApJEArJ=L7f$=YlvNv^%B3S8c_9YkJaN;+{_Bc}eTdec!E`UviP2dQ~DEMZMbO>ufvy zu_omt(7wkq6H|Ka+CyiZ6! zWuneLTR-14ry{qm7;P9of$8?4o63LY+V~%2oIsv~n3uHb*ptyVA^a64@@zYe%phEi za0Oez1M+p_*7XHSGe1e`Dc=P*vbex zcL{gmS?aZb&aC9-YwMIJ|2^u^*OK40bJh}{OuCnQ3}y5lDMNZ0Q$FA) zo96I~8utq3zXK>dk^42$Pf) z+&=2N!adEchy8z-2>W$sfvt3X`WXKus%MK{tG>-_7Qs0whP9+Fm)IA2VsE#ZMARp-`K&NgCV z=D&Ms;40;&6WzdFlsuU!UxRdA%eXt+c3!h-Rjh&Y1j^V-4-@W9!D#Ns6k184_pqTY zJeo$1a98C%&aEqxttbz9KITqO{1(>c`A0n8WAoLw`S#J)J)R#UeX#!hZHj#mWeuY7 z-+1^Ng-_r{?hHI@h^y2hS0a^sM!sayzN0c-KaNTD~4l<-(xe13-c)ac8PlT6J$y4HExnl@VBF|L97kHLJ zxQ}h@$J9z*FbDa6Rb21ixn$058_!`2y-oZjGU*42U8L>6iln)}fFS=bwj=jQA7;xE zbh?us$MeCIT}ODN%@<|sU4e(l|D3!RG0>6>g(+~10{uz6#I5Tf55FVrB?=7X{?a5n z>BxJL^wet@&-5dDR?@%0Be;m?S1=8C5AH*>F@t*`_jcmCKBXL2!2R|9Gzvs>_odPP zHbYu6Zy-M0#+OoHB=KKB};*K2xC zny&kVKgV9EYcl03Vp+=ddZC>bgs*dJ|2a+U19j$&7c$)>{uc2mwld}A7eY>38q0#a zsPtp>H3vQI&<$P-)iD5-BkWMK4qTS29z|F=emm7v~85v&;KFhyT$#g`;;H| zNWaIgKb{U!^4d)R9cd>uEbAbKb|GoGODW@X;bKEYr+XOeKO%B?hND| z&a+0`#R$K`-I(+*sf#}>bN)23^};XnYqLy;NMCXO(ON!+1V{e8WjQ z%=4VYvr|Xv)z;>#M0yGC&$;>YNdEWb_>gg@Ui$kd?w@3p#KJrX;>mSe(O4?KPTGB3 zq%@npkzjh#_-#Sw8uH`*f3Ek)vyH}IBR!+-gdUzGz74~9o|*g+#NW{VTTWmt4>sA# zqv^=^gkL37d&0lk^c}dIxUPd#{JE`sDCq~NqZX#O9qCJ+F)wuLZ{lIxh^IMhoJMJ;ITsq3U zPq?3r>v&LRE|>gr6M!-N+RcF(^Ox6_+EJh+7;seCQ^Z6)uLc?N0uxUZ7_;&sL5 z3IDJ3x5&%?yZ>%%9OWBxCsF?g(E4 zqg0^lBF|6Qu;MoezoP)xC*-R^Jv+JElRlQb7YL`GvP^{ckfy5;&p$}R_*>G*S`ruX zuqKHms6@Z{l!5frYdp_~5^u_#k328iX9dWchH|Ob3iA1F1Nlg=z#T;XIPz^JQ#+e? z7xBK_?)-m6U=o>9uUS+uKo9Me$vzuFqwkVlj60fVvx#Tr9!I=4@tWK-3HPCq+LT#O zJ@a_}CO#$Y2H{BTN}jqr|C~Fpk^c;~JwC^S)az{mr)_VQHka^dn=dubSSsW<(A;Yv z&+fcXUWqrjgUM6Z%|Qpr6GwaQMS4?>zXgR3a{s_xnkTJohSS6!QF$ja?k8;mVg4eM zdwoH89CtkFGf8=s^y7GxyROaiG3CPu`|)S;CewIFY{=b@e2+=bqF?_%B=R{KtKlYY zFX2U0+y+OIS=ZNOUZo0b=cbcBh`6qtUT-{$1@*O9CI~)H51H`j(M{{4MOq4D63H5KL zuJ+u`C|8+yb)NO&4rC=E^-AKwWA5YJ`>1fJt^8dw@*A2?5cc4nM7Sr<$`bya@|SEr z5AhGFtS`@XeMvl?TUQ6}(cEwH>`kmlncDjOpXIhNX-+II@P}w_^x3tYajAxIi=P;&T2M9DwjcERZDBPY5bukv>C>)A=h|lA0 zM*O6$Q00#EtR=U8-*+#S&m?@GmMe3|lm8JuB!5Qk%fz#g?*e&xsCQhylUAPiD?FdC zHPe-syE&Ed%z29k9hJxxYMGTj^K>D!f4W^%pvo z&gMBmdJ8+4qC7urit=B^U!F|Y$e=6AHu5#$T7-9!c{_J?o@e9!o3w+(uTv%$;Y3@m zuvK-O<5~X~;>8Kq*Ua(k5M^8Nyffh~q)*rH|D+{hqAlS)I?j6JraqAkR=Xew6;w;oviu)Jx)}pSSHcjcX2?xg6!aq{!U)+U=x5e>f zeuWHs$yiCbxjr*Ef054bx;t-h*CE`W%3r*Wkamx>R@Cv8eRkUVmdcWzow8#z|AUB3 z=hl^#L|sG3T$_xgYV6r(Wq&>BHc9MSs;r+Iu1>`wr^G&ioq-+Q7 zy>`$a>F2*ZB+RE!cl?aIFO~ErUYZIglkp6Ni*lc_g>Dl5m~eetsTf84FlFDSY#e%Q zUOhWXJU{i#QbZTex{%Mk-1A51Ga5Tj#@B874>m&~3Kpb5GVvJhzqq&BXKQ)ZgfauU zQ!oDJt&^L&d?du;M()%r6VG({a1M30;aT7ek(EUFyT(ogcRezcBChLOTeuGK%*0b@ zIKifUOQRo=|0?kO>GupDMyF2mc`t{!$JDMrDjtV;1 zOf!ieCA^Z%-S8_a+QQw&HkO9x^SO`kydclZ5l+26CQy;I#rO~l)7Ve=-`75!|G7Mv zLZwf5TGr-xK!F}Myo5$)Q~74{mBeMlGuy`M5I$=wZivUY^V)bG+tHfTrRy#7&L^!A z;Zu}fP5OELWLky0yREQ+EtHPTX>D2!GTx@p5aRRjB+pW>?lv%$XZvl#JIMdU=J|*4 z8PZ#Gf5F|D^b?f1O?oNrz)}*Mr`CqoY{9C8<85d3_$>ENJX=hmXOyYSoqF{neJXc0 zp6w^`4a)sPyb_)I$mZKexC+m+^K38A{M=R3F#kW0IEROS;0o?LJQz)(Bc$ol2}y86 z{8lW5tC6R$jf;}xpKUu@hBCkMd@*Uh7dohX6?yg}cW%Ou@qO+{)qae^Pbstzhfyda z8P@SI_4mlz5oQJ=VFR+3CEFs|&G8Mu3#J6&%UX4ggz0Oj}CE_#iTN2-+k}5Pbi}-J( zw|XIOYME4TleYn!rgf!L6S?b&CM?q?P2J$Q{YE2=cvQpU)zGhB`jLqNHac&lAFd zG5qH`k<=?c4>waNl+3RZ{)T%Im0uvO2=`s$Ey!G!=eo)gFF?4Oji<2AjzprB_EQO3wQGT3&PC^e@&joR5+Qt z4fzI=K1c<)&huPX7|+t$x=K)X8S#w7yAi&_eULm4T2ZhpcSj!T%1(F%9&=-KjLNPO z4xzwe!XMho-z2WwZ(U0U^SQNOaA zh3XO#XgkF1T2jZ3o^r`GMlElVzSYp!n7D*_C->Ja5=Ardjym9r4UO=dP@I2wq<=(w za)tvxdxDzA#SHN?l0p8V{&_)%mZtYbMGlQjNM3oUSGvrh17Z>rd;=(+{L}GcX>%kp z0-yg4Rqu{7dDH0xZ*t*t#nR2PwFJH0Yx_lNu96Wvw@CPqb#oY(WAKRM{(^vu~peZxbeBEx-= zW-Vqs{Vv@gUvx}~{1xnJ+=0C|A}%t)AMay# zg{zu~n9!(rCXYQxB_rJ?wM7_4q`L=ff6d}f`1{kedEFvTXIlZ?V9$b5* z<)YUUlD1MpTx3`Rhk*@Z#>}8tD6)(s$Wi{3syRFr(ggWqeO2o@T@tWbN{`&0scAC#;}gszr0~BgAL}ipqvkGp zXq?}d7_054QEIAE_e@Ai%YvRTZ@}GSdJ-Lz;0uq84~wBAnk?UdksMaag}P_i&mySb z;W12`@|un0i;atMThl2Dak^?b*j?JVZgZU5$msZlPz^COOvhT293L4Gtq#4~HA~ly zEW)rvMi8H}s<3B=H_yNM^*S)6Qd$-BJkLBYaI8SCU|)US5HZma4V&BE&da$ae}K1- zd7;GDuWX;21EZ~zI?{2aeibt`j zqO=U=)mgfnn^2w^a^I674y9Po=&}jEl%V>aC!T=22{>E{Zc9v?yA#|=NL|&?cweNu zwqYD0PFR$Bsreh280~gO3!8e1&CG@P?7qwh+YucoGVXiQAP zAa)IJJu^B^HVN_mutauq6WSOanJ}_r;sE>Eh)?;Wfya}!uzz4^VpM`JHikuvjf)%} z8a6WZOOW)qiKlnUzNVi3o~-UnB}5MOkBW)*rxb1Od7dU6ug19eltQn1&ZWy(t%|Qo zoqAR3q&#Zp3HSc{dF$pIqD}4Rn=mBG9~sTk4q(6NOmGGU_~Z1k@cSbC1L6`R_2pm= z5=Z>|b~IBlz(2_Ej|->p@Hp0!Ttj`~|J%2XPh0SRf7^6A{84-gc=!2zoYg@wRAWAM zDSYbcw9DJle|W3=c6D3gE9IvuhCf!`&*_O3OKuiJrcB!88ShQkJTxJ3XiD0xo>J*^{pZ`rM49XGJQ60 zRi*wfpGc0d`-N;586TB6Bq8PUZckxPCU;Td*i$J#?BRu%vwKWbgkEOM{cr`NQ`+qF z{F1Q`C&3>*gm+*lZ)^6nKO&Sl9>ob68pC;r_6_n67~qc%_C@>stQkM#gvCTButR+@ zvA&^x3jObkol@txXSk=h8Hag0{9neAvh0NCS>~Kw-0voRV=qO8(y5e%pL-@}&DBy{ zkEC#xzu;f9(KkAyuVQG~cqU~q!x|DA%S)RrGb(a0 z?~7OIaJ>5!bvLexgmbLjGJHfsH4%JBWBjq9yoz+9quqTyAT%^CB&Er1kKfZ=-_iK6 zL2;3T2PXKU{Qh{p4N>m2a?JHJpKmbVANs=!jc)5pI*4XX-|fCgS$D@1nJ&L6>9nO1 z-pgTwBK?dzGCnEOkDe77`8c{i8l|lG(eriMmz(-|#SKySOifxzlffPNzZ;P5yXTeR zMEU$t{9uqW`e)BHZ_3Y)Js+k|dFQF;peI91ZH)wfO6O;u$!UT@?Y9-HrF{O}lRjEslLyQ1erD;5zOuXrRBuR1QabNJuQxIw>9dbKc>)RH zekOJVpH=dO$1qJ1{t>)}{`1x_`;u1#Ga8}wc0aHFD05aroaU@i>Wi3mGzb6l>pEPO zYL;W7dC4T`yvUnpR2eYoGT^i%4@B^<7UCdDJMYm8`Tw++H_B=bp-48762#$>E z(N56XxWC{E@io_|=(_zb^HO3XMpi=cx2D${;ZHeU$9uw)mY)xzQ)bokmQ4SD0Q>2rzyJUM delta 32128 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 diff --git a/locale/nl_NL/LC_MESSAGES/django.po b/locale/nl_NL/LC_MESSAGES/django.po index 06ff309e1..445628c7b 100644 --- a/locale/nl_NL/LC_MESSAGES/django.po +++ b/locale/nl_NL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-20 08:08\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -54,19 +54,19 @@ msgstr "Wachtwoord komt niet overeen" msgid "Incorrect Password" msgstr "Onjuist wachtwoord" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Einddatum kan niet vÃŗÃŗr de begindatum zijn." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Einddatum van lezen kan niet voor begindatum zijn." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Einddatum van lezen kan niet in de toekomst zijn." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "De einddatum van lezen kan niet in de toekomst liggen." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Automatisch gegenereerd rapport" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "In behandeling" @@ -258,17 +259,24 @@ msgstr "Volgers" msgid "Private" msgstr "PrivÊ" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Actief" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Voltooid" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Gestopt" @@ -284,6 +292,10 @@ msgstr "Fout bij laden boek" msgid "Could not find a match for book" msgstr "Kan geen match vinden voor het boek" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Mislukt" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratis" @@ -359,7 +371,7 @@ msgstr "Recensies" msgid "Comments" msgstr "Opmerkingen" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Quotes" @@ -473,7 +485,7 @@ msgstr "įŽ€äŊ“中文 (Traditioneel Chinees)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Oh nee!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Toestemming geweigerd" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Je hebt geen toestemming om deze pagina te bekijken of deze actie uit te voeren. Je gebruikersrechtenniveau is %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Als u denkt dat u toegang zou moeten hebben, neem dan contact op met uw BookWyrm serverbeheerder." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,19 @@ msgstr "De pagina die u probeert te bezoeken lijkt niet te bestaan!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Bestand te groot" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Het bestand dat u wilt uploaden is te groot." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +" U kunt een kleiner bestand proberen te gebruiken of uw BookWyrm serverbeheerder vragen om de DATA_UPLOAD_MAX_MEMORY_SIZE instelling te verhogen.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -964,6 +978,7 @@ msgstr "Opslaan" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +996,7 @@ msgstr "Bij het laden van gegevens wordt verbinding gemaakt met %(source #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Bevestigen" @@ -1480,9 +1496,12 @@ msgid "Domain" msgstr "Domein" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1513,8 @@ msgstr "Status" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2547,7 +2567,7 @@ msgstr "Streepjescodelezer" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Gebruik de Lijsten, Ontdek, en Jouw boeken links om te ontdekken hoe je suggesties kunt lezen en wat er gebeurt op deze server, of om jouw catalogisboeken te zien!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2826,111 +2846,121 @@ msgid "No activities for this hashtag yet!" msgstr "Er zijn nog geen activiteiten voor deze hashtag!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importeer boeken" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Importeer boekenlijst" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Geen geldig CSV-bestand" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Momenteel mag je %(display_size)s boek importeren elke %(import_limit_reset)s dagen." msgstr[1] "Momenteel mag je %(display_size)s boeken importeren elke %(import_limit_reset)s dagen." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "Je hebt %(display_left)s over." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Recente imports hebben gemiddeld %(hours)s uur in beslag genomen." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Recente imports hebben gemiddeld %(minutes)s minuten in beslag genomen." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Gegevensbron:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Je kunt je Goodreads gegevens downloaden met behulp van de Import/Export pagina van je Goodreads account." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Data bestand:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Recensies toevoegen" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Privacyinstelling voor geïmporteerde recensies:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importeren" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Je hebt de limiet voor importeren bereikt." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importeren is tijdelijk uitgeschakeld. Bedankt voor je geduld." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Recent geïmporteerd" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Datum aangemaakt" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Laatst bijgewerkt" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Items" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Geen recente imports" @@ -2966,7 +2996,8 @@ msgid "Refresh" msgstr "Vernieuw" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Stop met importeren" @@ -3064,6 +3095,133 @@ msgstr "Deze import is in een oud formaat dat niet langer wordt ondersteund. Als msgid "Update import" msgstr "Import bijwerken" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Importeer BookWyrm Account" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "Geen geldig importbestand" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Stap 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Stap 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Gebruikersprofiel" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Gebruikersinstellingen" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Uw tijdszone" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "Uw standaard privacy-instelling voor post" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "Volgers en volgen" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "Geblokkeerde gebruikers" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "Leesdoelen" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "Overschrijft leesdoelen voor alle jaren vermeld in het importbestand" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "Boekenplanken" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "Leesgeschiedenis" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "Recensies boeken" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "Opmerkingen over boeken" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "Boekenlijst" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "Opgeslagen lijsten" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3242,7 @@ msgid "Reject" msgstr "Afwijzen" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Mislukte items" @@ -3864,6 +4022,16 @@ msgstr "heeft de naam van %(group_name)s verander msgid "has changed the description of %(group_name)s" msgstr "heeft de omschrijving van %(group_name)s gewijzigd" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Verwijder meldingen" @@ -4107,7 +4275,7 @@ msgstr "Alias verwijderen" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Geblokkeerde gebruikers" @@ -4242,14 +4410,66 @@ msgstr "Standaard privacyniveau berichten:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Op zoek naar privacy voor boekenplanken? Je kan een apart zichtbaarheidsniveau instellen voor elk van je boekenplanken. Ga naar Jouw boeken, kies een boekenplank in de tabbalk en klik op \"Bewerk boekenplank\"" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "Exporteer BookWyrm Account" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "Maak gebruikersexportbestand aan" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "Recente exporten" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Datum" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "Grootte" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "Download uw export" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSV Export" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "Exporteer boekenlijst" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Je export bevat alle boeken op je boekenplanken, boeken waar je een recensie voor hebt geschreven en boeken met leesactiviteit." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4487,7 @@ msgstr "Verhuis account" msgid "Data" msgstr "Gegevens" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV export" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relaties" @@ -4763,7 +4979,8 @@ msgid "Active Tasks" msgstr "Actieve Taken" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5157,9 +5374,14 @@ msgid "No instances found" msgstr "Geen instances gevonden" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Stop met importeren?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Schakel het starten van nieuwe imports uit" @@ -5172,70 +5394,107 @@ msgstr "Dit is alleen bedoeld om te worden gebruikt wanneer er iets helemaal ver msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Zolang importeren is uitgeschakeld kunnen gebruikers geen nieuwe imports starten, maar bestaande imports blijven doorgaan." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Importeren uitschakelen" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Gebruikers kunnen momenteel geen nieuwe imports starten" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Importeren inschakelen" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Beperk het aantal imports" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Sommige gebruikers proberen misschien een groot aantal boeken te importeren, wat je wilt beperken." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Zet de waarde op 0 om geen limiet af te dwingen." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Importlimiet instellen op" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "boeken elke" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "dagen." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Limiet instellen" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "Beperk de import en export van gebruikers tot eenmaal elke " + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "uren" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "Wijzig limiet" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "Geïmporteerde boeken" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Voltooid" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Gebruiker" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Laatst Bijgewerkt" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Openstaande items" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Succesvolle items" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Geen overeenkomende importen gevonden." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "Geïmporteerde gebruikers" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5722,7 +5981,7 @@ msgstr "Standaardthema van instance instellen" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Een van uw thema's lijkt kapot te zijn. Het selecteren van dit thema maakt de toepassing onbruikbaar." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5776,15 +6035,15 @@ msgstr "Thema verwijderen" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Test thema" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Gebroken thema" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Succesvol geladen" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5833,7 +6092,7 @@ msgstr "Niet ingesteld" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Dit account is de instance actor voor het ondertekenen van HTTP-verzoeken." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -5905,15 +6164,15 @@ msgstr "Gebruikersacties" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Dit is de beheerder van de server" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Je moet deze rekening niet verwijderen of uitschakelen omdat deze cruciaal is voor de werking van je server. Deze actor signeert uitgaande GET-verzoeken om vloeiende interactie met veilige ActivityPub servers mogelijk te maken." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Dit account kan niet ontdekt worden door gewone gebruikers en heeft geen profielpagina." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6048,17 +6307,15 @@ msgstr "Nieuwe boekenplank maken" msgid "Edit Shelf" msgstr "Bewerk boekenplank" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Gebruikersprofiel" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Alle boeken" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importeer boeken" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6625,7 +6882,7 @@ msgstr "heeft %(book)s beoordeeld:" #: bookwyrm/templates/snippets/status/headers/read.html:10 #, python-format msgid "finished reading %(book)s by %(author_name)s" -msgstr "heeft %(book)s door %(author_name)s uitlezen" +msgstr "heeft %(book)s door %(author_name)s gelezen" #: bookwyrm/templates/snippets/status/headers/read.html:17 #, python-format diff --git a/locale/no_NO/LC_MESSAGES/django.mo b/locale/no_NO/LC_MESSAGES/django.mo index 9fad84bd2222cd9495f1343c1ba14f7787d1aec3..29996d39e01d25a76224b3309857bc5760a73b99 100644 GIT binary patch delta 25178 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 delta 25252 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 kCGFzoEs`gC\n" "Language-Team: Norwegian\n" "Language: no\n" @@ -54,19 +54,19 @@ msgstr "Passordet samsvarer ikke" msgid "Incorrect Password" msgstr "Feil passord" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Sluttdato kan ikke vÃĻre før startdato." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Stoppdato for lesing kan ikke vÃĻre før startdato." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Stoppdato for lesing kan ikke vÃĻre i fremtiden." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Sluttdato for lesing kan ikke vÃĻre i fremtiden." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Automatisk generert rapport" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Avventer" @@ -258,17 +259,24 @@ msgstr "Følgere" msgid "Private" msgstr "Privat" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktiv" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Ferdig" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Stoppet" @@ -284,6 +292,10 @@ msgstr "Feilet ved lasting av bok" msgid "Could not find a match for book" msgstr "Fant ikke den boka" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratis" @@ -359,7 +371,7 @@ msgstr "Anmeldelser" msgid "Comments" msgstr "Kommentarer" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Sitater" @@ -964,6 +976,7 @@ msgstr "Lagre" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +994,7 @@ msgstr "Laster inn data kobler til %(source_name)s og finner me #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Bekreft" @@ -1480,9 +1494,12 @@ msgid "Domain" msgstr "Domene" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1511,8 @@ msgstr "Status" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2826,111 +2844,121 @@ msgid "No activities for this hashtag yet!" msgstr "Ingen aktiviteter for denne emneknaggen ennÃĨ!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importer bøker" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "Ikke en gyldig CSV-fil" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "I gjennomsnitt har de siste importene tatt %(hours)s timer." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "I gjennomsnitt har de siste importene tatt %(minutes)s minutter." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Datakilde:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Du kan laste ned Goodreads-dataene dine fra Import/Export-siden pÃĨ Goodreads-kontoen din." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Datafil:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Inkluder anmeldelser" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Personverninnstilling for importerte anmeldelser:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "ImportÊr" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Du har nÃĨdd importeringsgrensa." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importering er midlertidig deaktivert; takk for din tÃĨlmodighet." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Nylig importer" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Opprettet dato" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Sist oppdatert" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Elementer" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Ingen nylige importer" @@ -2966,7 +2994,8 @@ msgid "Refresh" msgstr "Oppdater" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Stopp import" @@ -3064,6 +3093,133 @@ msgstr "Denne importen er i et gammelt format som ikke lenger støttes. Klikk p msgid "Update import" msgstr "Oppdater import" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Brukerprofil" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3240,7 @@ msgid "Reject" msgstr "AvslÃĨ" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Mislykkede ting" @@ -3864,6 +4020,16 @@ msgstr "har endret navnet pÃĨ %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "har endret beskrivelsen av %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Slette varsler" @@ -4107,7 +4273,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Blokkerte brukere" @@ -4242,13 +4408,65 @@ msgstr "Standard tilgangsnivÃĨ pÃĨ innlegg:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSV-eksport" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." msgstr "" #: bookwyrm/templates/preferences/export.html:20 @@ -4267,11 +4485,7 @@ msgstr "" msgid "Data" msgstr "Data" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV-eksport" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relasjoner" @@ -4761,7 +4975,8 @@ msgid "Active Tasks" msgstr "" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "" @@ -5155,9 +5370,14 @@ msgid "No instances found" msgstr "Ingen instanser funnet" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "" @@ -5170,70 +5390,107 @@ msgstr "" msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Sett importgrense til" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "bøker hver" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "dager." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Sett grense" -#: bookwyrm/templates/settings/imports/imports.html:102 -msgid "Completed" -msgstr "Fullført" - -#: bookwyrm/templates/settings/imports/imports.html:116 -msgid "User" -msgstr "Bruker" - -#: bookwyrm/templates/settings/imports/imports.html:125 -msgid "Date Updated" +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:132 -msgid "Pending items" +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 +msgid "Completed" +msgstr "Fullført" + +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 +msgid "User" +msgstr "Bruker" + +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 +msgid "Date Updated" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:165 +msgid "Pending items" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "" +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6046,17 +6303,15 @@ msgstr "Lag hylle" msgid "Edit Shelf" msgstr "Rediger hylle" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Brukerprofil" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Alle bøker" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importer bøker" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/pl_PL/LC_MESSAGES/django.mo b/locale/pl_PL/LC_MESSAGES/django.mo index 2f9ab5f42cb2c606864effa9abd2277f292961ae..d8acdec42fd8a22040b012c21a430ce8dfe66550 100644 GIT binary patch delta 36418 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 delta 28481 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 aG~uDaanWf4PW!H=4S1F!?n%yoj{gHi*O^=Z diff --git a/locale/pl_PL/LC_MESSAGES/django.po b/locale/pl_PL/LC_MESSAGES/django.po index 9d2fec098..ce119da92 100644 --- a/locale/pl_PL/LC_MESSAGES/django.po +++ b/locale/pl_PL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-02-26 20:08\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Polish\n" "Language: pl\n" @@ -54,19 +54,19 @@ msgstr "Hasła nie są identyczne" msgid "Incorrect Password" msgstr "Niepoprawne hasło" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Data ukończenia czytania musi mieć miejsce po dacie rozpoczęcia." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Data ukończenia czytania musi mieć miejsce po dacie rozpoczęcia." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Data wstrzymania czytania nie moÅŧe być w przyszłości." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Data zakończenia czytania nie moÅŧe być w przyszłości." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Automatycznie wygenerowany raport" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Oczekujące" @@ -258,17 +259,24 @@ msgstr "Obserwujący" msgid "Private" msgstr "Prywatne" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktywne" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Zakończone" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Wstrzymane" @@ -284,6 +292,10 @@ msgstr "Błąd wczytywania ksiąÅŧki" msgid "Could not find a match for book" msgstr "Nie znaleziono pasującej ksiąÅŧki" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "Błąd" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Bezpłatne" @@ -305,47 +317,47 @@ msgstr "Zatwierdzone" #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 msgid "Comment" -msgstr "" +msgstr "Skomentuj" #: bookwyrm/models/report.py:85 msgid "Resolved report" -msgstr "" +msgstr "Rozwiązane zgłoszenie" #: bookwyrm/models/report.py:86 msgid "Re-opened report" -msgstr "" +msgstr "Ponownie otworzone zgłoszenie" #: bookwyrm/models/report.py:87 msgid "Messaged reporter" -msgstr "" +msgstr "Wysłano do zgłaszającego" #: bookwyrm/models/report.py:88 msgid "Messaged reported user" -msgstr "" +msgstr "Wysłano do zgłoszonego uÅŧytkownika" #: bookwyrm/models/report.py:89 msgid "Suspended user" -msgstr "" +msgstr "UÅŧytkownik zawieszony" #: bookwyrm/models/report.py:90 msgid "Un-suspended user" -msgstr "" +msgstr "Anulowano zawieszenie" #: bookwyrm/models/report.py:91 msgid "Changed user permission level" -msgstr "" +msgstr "Zmieniono poziom uprawnień uÅŧytkownika" #: bookwyrm/models/report.py:92 msgid "Deleted user account" -msgstr "" +msgstr "Usunięto konto uÅŧytkownika" #: bookwyrm/models/report.py:93 msgid "Blocked domain" -msgstr "" +msgstr "Domena zablokowana" #: bookwyrm/models/report.py:94 msgid "Approved domain" -msgstr "" +msgstr "Zatwierdzona domena" #: bookwyrm/models/report.py:95 msgid "Deleted item" @@ -359,7 +371,7 @@ msgstr "Oceny" msgid "Comments" msgstr "Komentarze" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Cytaty" @@ -409,7 +421,7 @@ msgstr "EspaÃąol (Hiszpański)" #: bookwyrm/settings.py:318 msgid "Euskara (Basque)" -msgstr "" +msgstr "Euskara (Baskijski)" #: bookwyrm/settings.py:319 msgid "Galego (Galician)" @@ -441,7 +453,7 @@ msgstr "Norsk (Norweski)" #: bookwyrm/settings.py:326 msgid "Polski (Polish)" -msgstr "Polski" +msgstr "polski" #: bookwyrm/settings.py:327 msgid "PortuguÃĒs do Brasil (Brazilian Portuguese)" @@ -461,7 +473,7 @@ msgstr "Svenska (Szwedzki)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukraiński)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (Tradycyjny chiński)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "O nie!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "Odmowa dostępu" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Brak uprawnień do zobaczenia tej strony lub wykonania tej czynności. Poziom Twoich uprawnień to %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Jeśli Twoim zdaniem jest to błąd, skontaktuj się ze swoim administratorem serwera BookWyrm." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,19 @@ msgstr "Wygląda na to, Åŧe ta strona nie istnieje!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Za duÅŧy plik" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Przesyłany plik jest za duÅŧy." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +" MoÅŧesz sprÃŗbować przesłać mniejszy plik lub poprosić swojego administratora serwera BookWyrm o zwiększenie wartości ustawienia DATA_UPLOAD_MAX_MEMORY_SIZE.\n" +" " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -536,7 +550,7 @@ msgstr "Witaj na %(site_name)s!" #: bookwyrm/templates/about/about.html:25 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." -msgstr "%(site_name)s jest częścią BookWyrm, sieci niezaleÅŧnych, samostanowiących społeczności czytelnikÃŗw. MoÅŧesz beproblemowo wchodzić w interakcje z uÅŧytkownikami gdziekolwiek w sieci BookWyrm, ta społeczność jest wyjątkowa." +msgstr "%(site_name)s jest częścią BookWyrm, sieci niezaleÅŧnych, samostanowiących społeczności czytelnikÃŗw. MoÅŧesz bezproblemowo wchodzić w interakcje z uÅŧytkownikami gdziekolwiek w sieci BookWyrm." #: bookwyrm/templates/about/about.html:45 #, python-format @@ -555,7 +569,7 @@ msgstr "%(title)s ma najbardziej podzielo #: bookwyrm/templates/about/about.html:94 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." -msgstr "ŚledÅē swÃŗj postęp czytelniczy, rozmawiaj o ksiąÅŧkach, pisz opinie i odkrywaj co czytać następne. Na zawsze bez reklam, antykorporacyjne i skierowane w stronę społeczności, BookWyrm jest programem dla ludzi, stworzonym, by pozostać małym i personalnym. Jeśli masz pomysł, zauwaÅŧył_ś błąd, albo masz wielkie marzenie, złoś się i pozwÃŗl się wysłuchać." +msgstr "ŚledÅē swÃŗj postęp czytania, rozmawiaj o ksiąÅŧkach, pisz recenzje i odkryj swoją następną ksiąÅŧkę. Na zawsze bez reklam, antykorporacyjne i skierowane w stronę społeczności, BookWyrm jest oprogramowaniem dla ludzi, stworzonym, by pozostać małym i personalnym. Jeśli masz pomysł, chcesz zgłosić błąd lub masz wielką wizję, daj znać i pozwÃŗl się wysłuchać." #: bookwyrm/templates/about/about.html:105 msgid "Meet your admins" @@ -925,7 +939,7 @@ msgstr "Klucz Goodreads:" #: bookwyrm/templates/author/edit_author.html:109 msgid "ISFDB:" -msgstr "" +msgstr "ISFDB:" #: bookwyrm/templates/author/edit_author.html:116 msgid "ISNI:" @@ -972,6 +986,7 @@ msgstr "Zapisz" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -989,6 +1004,7 @@ msgstr "Wczytanie danych spowoduje połączenie z %(source_name)sLists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "UÅŧyj odnośnikÃŗw Listy, Odkrywaj oraz Twoje ksiąÅŧki, aby odkrywać sugestie czytania i najnowsze wydarzenia na tym serwerze lub zobaczyć swoje skatalogowane ksiąÅŧki!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2579,15 +2599,15 @@ msgstr "KsiąÅŧki na Twoich pÃŗłkach statusu czytania zostaną pokazane tutaj." #: bookwyrm/templates/guided_tour/home.html:151 msgid "Updates from people you are following will appear in your Home timeline.

    The Books tab shows activity from anyone, related to your books." -msgstr "" +msgstr "Aktualizacje od obserwowanych osÃŗb zostaną pokazane na osi Głowna.

    W karcie KsiąÅŧki pokazywana jest aktywność kaÅŧdej osoby związana z Twoimi ksiąÅŧkami." #: bookwyrm/templates/guided_tour/home.html:152 msgid "Timelines" -msgstr "" +msgstr "Osie czasu" #: bookwyrm/templates/guided_tour/home.html:176 msgid "The bell will light up when you have a new notification. When it does, click on it to find out what exciting thing has happened!" -msgstr "Dzwonek podświetli się, gdy dostaniesz nowe powiadomienie. Gdy tak się stanie, naciśnij na niego, aby zobaczyć co ciekawego się wydarzyło!" +msgstr "Dzwonek zostanie podświetlony, gdy dostaniesz nowe powiadomienie. Gdy tak się stanie, naciśnij na niego, aby zobaczyć, co ciekawego się wydarzyło!" #: bookwyrm/templates/guided_tour/home.html:177 #: bookwyrm/templates/layout.html:77 bookwyrm/templates/layout.html:107 @@ -2599,11 +2619,11 @@ msgstr "Powiadomienia" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Dostęp do swojego profilu, katalogu uÅŧytkownika, wiadomości bezpośrednich oraz ustawień moÅŧesz uzyskać, naciskając na swoją nazwę w tym menu." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." -msgstr "Wybierz Profil z listy rozwijanej menu, aby kontynuować." +msgstr "Wybierz Profil z rozwijanego menu, aby kontynuować." #: bookwyrm/templates/guided_tour/home.html:201 msgid "Profile and settings menu" @@ -2644,11 +2664,11 @@ msgstr "Prywatność listy" #: bookwyrm/templates/guided_tour/lists.html:105 msgid "You can also decide how your list is to be curated - only by you, by anyone, or by a group." -msgstr "" +msgstr "MoÅŧesz zdecydować, przez kogo moÅŧe być edytowana Twoja lista — tylko przez Ciebie, przez kogokolwiek lub przez grupę." #: bookwyrm/templates/guided_tour/lists.html:106 msgid "List curation" -msgstr "" +msgstr "Edytowanie listy" #: bookwyrm/templates/guided_tour/lists.html:128 msgid "Next in our tour we will explore Groups!" @@ -2709,7 +2729,7 @@ msgstr "Kontynuuj" #: bookwyrm/templates/guided_tour/user_books.html:10 msgid "This is the page where your books are listed, organised into shelves." -msgstr "" +msgstr "Na tej stronie Twoje ksiąÅŧki są uporządkowane na pÃŗłkach." #: bookwyrm/templates/guided_tour/user_books.html:11 #: bookwyrm/templates/user/books_header.html:4 @@ -2718,11 +2738,11 @@ msgstr "Twoje ksiąÅŧki" #: bookwyrm/templates/guided_tour/user_books.html:31 msgid "To Read, Currently Reading, Read, and Stopped Reading are default shelves. When you change the reading status of a book it will automatically be moved to the matching shelf. A book can only be on one default shelf at a time." -msgstr "" +msgstr "Do przeczytania, Obecnie czytane, Przeczytane oraz Wstrzymane to domyślne pÃŗłki. Po zmianie statusu czytania ksiąÅŧki zostanie ona automatycznie przeniesiona na odpowiednią pÃŗłkę. KsiąÅŧka moÅŧe być umieszczona jednocześnie tylko na jednej z domyślnych pÃŗłek." #: bookwyrm/templates/guided_tour/user_books.html:32 msgid "Reading status shelves" -msgstr "" +msgstr "PÃŗłki statusu czytania" #: bookwyrm/templates/guided_tour/user_books.html:55 msgid "You can create additional custom shelves to organise your books. A book on a custom shelf can be on any number of other shelves simultaneously, including one of the default reading status shelves" @@ -2839,120 +2859,130 @@ msgstr "ZnajdÅē ksiąÅŧkę" #: bookwyrm/templates/hashtag.html:12 #, python-format msgid "See tagged statuses in the local %(site_name)s community" -msgstr "" +msgstr "Zobacz oznaczone statusy w lokalnej społeczności %(site_name)s" #: bookwyrm/templates/hashtag.html:25 msgid "No activities for this hashtag yet!" -msgstr "Brak aktywności dla tej etykiety!" +msgstr "Brak aktywności dla tego znacznika!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importuj ksiąÅŧki" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "Importuj listę ksiąÅŧek" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "To nie jest prawidłowy plik CSV" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Obecnie moÅŧesz importować %(display_size)s ksiąÅŧek co %(import_limit_reset)s dzień." +msgstr[1] "Obecnie moÅŧesz importować %(display_size)s ksiąÅŧek co %(import_limit_reset)s dni." +msgstr[2] "Obecnie moÅŧesz importować %(display_size)s ksiąÅŧek co %(import_limit_reset)s dni." +msgstr[3] "Obecnie moÅŧesz importować %(display_size)s ksiąÅŧek co %(import_limit_reset)s dni." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." -msgstr "" +msgstr "Pozostało %(display_left)s." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Ostatnie importy zajmowały średnio %(hours)s godzin." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Ostatnie importy zajmowały średnio %(minutes)s minut." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "ÅšrÃŗdło danych:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." -msgstr "" +msgstr "MoÅŧesz pobrać swoje dane Goodreads ze strony Importuj/Eksportuj na swoim koncie Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Plik danych:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Uwzględnij recenzje" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Ustawienia prywatności dla importowanych recenzji:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importuj" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Limit importÃŗw osiągnięty." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importowanie jest tymczasowo wyłączone; dziękujemy za Twoją cierpliwość." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Najnowsze recenzje" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Data utworzenia" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Najnowsza aktualizacja" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" -msgstr "" +msgstr "Elementy" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Brak ostatnich importÃŗw" @@ -2965,7 +2995,7 @@ msgstr "Status importu" #: bookwyrm/templates/import/import_status.html:13 #: bookwyrm/templates/import/import_status.html:27 msgid "Retry Status" -msgstr "" +msgstr "PonÃŗw status" #: bookwyrm/templates/import/import_status.html:22 #: bookwyrm/templates/settings/celery.html:45 @@ -2988,7 +3018,8 @@ msgid "Refresh" msgstr "OdświeÅŧ" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Wstrzymaj import" @@ -3004,7 +3035,7 @@ msgstr[3] "%(display_counter)s elementÃŗw wymaga ręcznego zatwierdzenia." #: bookwyrm/templates/import/import_status.html:83 #: bookwyrm/templates/import/manual_review.html:8 msgid "Review items" -msgstr "" +msgstr "Przejrzyj elementy" #: bookwyrm/templates/import/import_status.html:89 #, python-format @@ -3084,12 +3115,139 @@ msgstr "PonÃŗw" #: bookwyrm/templates/import/import_status.html:237 msgid "This import is in an old format that is no longer supported. If you would like to troubleshoot missing items from this import, click the button below to update the import format." -msgstr "" +msgstr "Ten import jest zapisany w starym formacie, ktÃŗry nie jest juÅŧ obsługiwany. Jeśli chcesz rozwiązać problemy z brakującymi elementami z tego importu, naciśnij na poniÅŧszy przycisk, aby zaktualizować format importu." #: bookwyrm/templates/import/import_status.html:239 msgid "Update import" msgstr "Zaktualizuj import" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "Importuj konto BookWyrm" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "To nie jest prawidłowy plik importu" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "Jeśli chcesz przenieść jakiekolwiek statusy (komentarze, recenzje lub cytaty), naleÅŧy ustawić to konto jako alias konta, z ktÃŗrego chcesz coś przenieść lub przenieś to konto do tego przed importowaniem swoich danych uÅŧytkownika." + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "Obecnie moÅŧesz importować jednego uÅŧytkownika co %(user_import_hours)s godzin." + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Krok 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "Wybierz plik eksportu wygenerowany z innego konta BookWyrm. Plik powinien być w formacie .tar.gz." + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Krok 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "Odznacz wszelkie pola wyboru danych, ktÃŗrych nie chcesz zawrzeć w swoim imporcie." + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Profil uÅŧytkownika" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "Nadpisuje nazwę wyświetlaną, podsumowanie oraz awatar" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "Ustawienia uÅŧytkownika" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "Nadpisuje:" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3110,7 +3268,7 @@ msgid "Reject" msgstr "Odrzuć" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "" @@ -3900,6 +4058,16 @@ msgstr "zmienia nazwę dla %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "zmienia opis dla %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Usuń powiadomienia" @@ -4143,7 +4311,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Zablokowani uÅŧytkownicy" @@ -4278,14 +4446,66 @@ msgstr "Domyślna prywatność wpisu:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Eksport CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "TwÃŗj eksport będzie zawierał wszystkie ksiąÅŧki na Twoich pÃŗłkach, ksiąÅŧki z Twoimi recenzjami oraz ksiąÅŧki z aktywnością czytania." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4303,11 +4523,7 @@ msgstr "" msgid "Data" msgstr "Dane" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Eksport CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relacje" @@ -4801,7 +5017,8 @@ msgid "Active Tasks" msgstr "Aktywne zadania" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5203,9 +5420,14 @@ msgid "No instances found" msgstr "Brak instancji" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Wstrzymać import?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "" @@ -5218,70 +5440,107 @@ msgstr "" msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Wyłącz importowanie" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "UÅŧytkownicy nie mogą obecnie rozpoczynać nowych importÃŗw" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Włącz importowanie" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Ograniczenie ilości importÃŗw" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Część uÅŧytkownikÃŗw moÅŧe podjąć prÃŗbę importu duÅŧej ilości ksiąÅŧek, co moÅŧesz ograniczyć." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Ustaw wartość na 0, aby nie wymuszać Åŧadnego ograniczenia." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Ustaw limit importÃŗw na" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "ksiąÅŧek co" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "dni." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Ustaw ograniczenie" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Zakończone" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "UÅŧytkownik" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Data przesłania" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Oczekujące" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Zakończone elementy" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Nie znaleziono pasujących importÃŗw." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6094,17 +6353,15 @@ msgstr "UtwÃŗrz pÃŗłkę" msgid "Edit Shelf" msgstr "Edytuj pÃŗłkę" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Profil uÅŧytkownika" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Wszystkie ksiąÅŧki" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importuj ksiąÅŧki" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index 565cb0e0d06b992397c7537a90d526cc88d2b992..43e0165aceac0de44c323a324bd1b8d4983efe29 100644 GIT binary patch delta 23956 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 delta 24304 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 LqeOeJe187}Cm~TT diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index a8965b165..5fb111642 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-02 04:10\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -54,19 +54,19 @@ msgstr "As senhas nÃŖo correspondem" msgid "Incorrect Password" msgstr "Senha incorreta" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "A data de tÊrmino da leitura nÃŖo pode ser anterior a de início." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "A data de tÊrmino da leitura nÃŖo pode ser antes da data de começo." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "A data de tÊrmino da leitura nÃŖo pode estar no futuro." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "A data final da leitura nÃŖo pode ser no futuro." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "RelatÃŗrio gerado automaticamente" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Pendente" @@ -258,17 +259,24 @@ msgstr "Seguidores" msgid "Private" msgstr "Particular" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Ativo" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Completo" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Parado" @@ -284,6 +292,10 @@ msgstr "Erro ao carregar livro" msgid "Could not find a match for book" msgstr "NÃŖo foi possível encontrar o livro" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratuito" @@ -359,7 +371,7 @@ msgstr "Resenhas" msgid "Comments" msgstr "ComentÃĄrios" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "CitaçÃĩes" @@ -964,6 +976,7 @@ msgstr "Salvar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +994,7 @@ msgstr "Para carregar informaçÃĩes nos conectaremos a %(source_name)sImport/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Arquivo de dados:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Incluir resenhas" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "ConfiguraçÃĩes de privacidade para resenhas importadas:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "ImportaçÃĩes recentes" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Nenhuma importaçÃŖo recente" @@ -2966,7 +2994,8 @@ msgid "Refresh" msgstr "Atualizar" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "" @@ -3064,6 +3093,133 @@ msgstr "Esta importaçÃŖo estÃĄ em um formato antigo que nÃŖo Ê mais compatíve msgid "Update import" msgstr "Atualizar importaçÃŖo" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Perfil do usuÃĄrio" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3240,7 @@ msgid "Reject" msgstr "Rejeitar" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Itens cuja importaçÃŖo falhou" @@ -3864,6 +4020,16 @@ msgstr "mudou o nome de %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "mudou a descriçÃŖo de %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Limpar notificaçÃĩes" @@ -4107,7 +4273,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "UsuÃĄrios bloqueados" @@ -4242,14 +4408,66 @@ msgstr "Privacidade padrÃŖo das publicaçÃĩes:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Exportar CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Seu arquivo conterÃĄ todos os livros em suas estantes, suas resenhas e o andamento de suas leituras." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4485,7 @@ msgstr "" msgid "Data" msgstr "Dados" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Exportar CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "RelaçÃĩes" @@ -4761,7 +4975,8 @@ msgid "Active Tasks" msgstr "" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "" @@ -5155,9 +5370,14 @@ msgid "No instances found" msgstr "Nenhuma instÃĸncia encontrada" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "" @@ -5170,70 +5390,107 @@ msgstr "" msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:102 -msgid "Completed" +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:116 -msgid "User" +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:125 -msgid "Date Updated" -msgstr "" - -#: bookwyrm/templates/settings/imports/imports.html:132 -msgid "Pending items" +msgid "Book Imports" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 +msgid "Completed" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 +msgid "User" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 +msgid "Date Updated" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:165 +msgid "Pending items" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "" +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6046,17 +6303,15 @@ msgstr "Criar estante" msgid "Edit Shelf" msgstr "Editar estante" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Perfil do usuÃĄrio" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Todos os livros" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importar livros" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/pt_PT/LC_MESSAGES/django.mo b/locale/pt_PT/LC_MESSAGES/django.mo index d2cc1bacb7f1878c817fb2d0ca16236d1e7a787e..d44898ecd9c078972dd4e3091799edfeb9980916 100644 GIT binary patch delta 29612 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 delta 29983 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 diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index 7a7fbdf9b..52cc6f770 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-02 04:10\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -54,19 +54,19 @@ msgstr "Palavras-passe nÃŖo coincidem" msgid "Incorrect Password" msgstr "Palavra-passe Incorreta" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "A data final de leitura nÃŖo pode ser anterior à data de início." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "A data de paragem de leitura nÃŖo pode ser anterior à data de início." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Data de paragem de leitura nÃŖo pode ser no futuro." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Data de fim de leitura nÃŖo pode ser no futuro." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "RelatÃŗrio gerado automaticamente" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "Pendente" @@ -258,17 +259,24 @@ msgstr "Seguidores" msgid "Private" msgstr "Privado" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Ativo" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "Concluído" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Parado" @@ -284,6 +292,10 @@ msgstr "Erro ao carregar o livro" msgid "Could not find a match for book" msgstr "NÃŖo foi possível encontrar um resultado para o livro pedido" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "GrÃĄtis" @@ -359,7 +371,7 @@ msgstr "Criticas" msgid "Comments" msgstr "ComentÃĄrios" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "CitaçÃĩes" @@ -964,6 +976,7 @@ msgstr "Salvar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +994,7 @@ msgstr "Carregar os dados irÃĄ conectar a %(source_name)s e ver #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmar" @@ -1480,9 +1494,12 @@ msgid "Domain" msgstr "Domínio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1494,7 +1511,8 @@ msgstr "Estado" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2826,111 +2844,121 @@ msgid "No activities for this hashtag yet!" msgstr "Ainda nÃŖo hÃĄ atividades para esta hashtag!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importar livros" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "NÃŖo Ê um ficheiro CSV vÃĄlido" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Em mÊdia, as importaçÃĩes recentes levaram %(hours)s horas." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Em mÊdia, as importaçÃĩes recentes levaram %(minutes)s minutos." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Origem dos dados:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph(CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Podes fazer download dos teus dados do Goodreads na Importar/Exportar pÃĄgina da tua conta do Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Ficheiro de dados:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Incluir criticas" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "ConfiguraçÃŖo de privacidade para criticas importadas:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Atingiste o teu limite de importaçÃĩes." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "As importaçÃĩes estÃŖo temporariamente desativadas; obrigado pela tua paciÃĒncia." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "ImportaçÃĩes recentes" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Data de criaçÃŖo" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Última AtualizaçÃŖo" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "Items" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Nenhuma importaçÃŖo recente" @@ -2966,7 +2994,8 @@ msgid "Refresh" msgstr "Atualizar" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Parar importaçÃŖo" @@ -3064,6 +3093,133 @@ msgstr "Esta importaçÃŖo estÃĄ num formato antigo que jÃĄ nÃŖo Ê suportado. Se msgid "Update import" msgstr "Atualizar importaçÃŖo" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Perfil de utilizador" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3240,7 @@ msgid "Reject" msgstr "Rejeitar" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Itens falhados" @@ -3864,6 +4020,16 @@ msgstr "mudou o nome de %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "mudou a descriçÃŖo de %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Apagar notificaçÃĩes" @@ -4107,7 +4273,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Utilizadores Bloqueados" @@ -4242,14 +4408,66 @@ msgstr "Privacidade de publicaçÃŖo predefinida:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "Procuras a privacidade na prateleira? Podes definir um nível de visibilidade separado para cada uma das tuas prateleiras. Vai para Os Teus livros, seleciona uma prateleira na barra de divisores e carrega em \"Editar prateleira\"" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Exportar para CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "A exportaçÃŖo incluirÃĄ todos os livros das tuas prateleiras, livros que tu jÃĄ avaliaste e livros com a atividade da leitura." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4485,7 @@ msgstr "" msgid "Data" msgstr "Dados" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Exportar CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relacionamentos" @@ -4761,7 +4975,8 @@ msgid "Active Tasks" msgstr "Tarefas ativas" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5155,9 +5370,14 @@ msgid "No instances found" msgstr "Nenhum domínio encontrado" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Parar importaçÃŖo?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Desativar o início de novas importaçÃĩes" @@ -5170,70 +5390,107 @@ msgstr "SÃŗ se destina a ser utilizado quando as coisas correram muito mal com a msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Enquanto as importaçÃĩes sÃŖo desativadas, os utilizadores nÃŖo serÃŖo autorizados a iniciar novas importaçÃĩes, mas as importaçÃĩes existentes nÃŖo serÃŖo afetadas." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Desativar importaçÃĩes" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Atualmente os usuÃĄrios nÃŖo podem iniciar novas importaçÃĩes" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Ativar a ImportaçÃŖo" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Limitar a quantidade de importaçÃĩes" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "Alguns usuÃĄrios podem tentar importar um grande nÃēmero de livros, algo que deves limitar." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Define o valor como 0 para nÃŖo aplicar qualquer limite." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Definir limite de importaçÃŖo para" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "livros a cada" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "dias." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Definir limite" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "Completado" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Utilizador" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Data de ModificaçÃŖo" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Itens pendentes" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "Itens bem sucedidos" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Nenhuma importaçÃŖo correspondente foi encontrada." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6046,17 +6303,15 @@ msgstr "Criar prateleira" msgid "Edit Shelf" msgstr "Editar prateleira" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Perfil de utilizador" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Todos os livros" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importar livros" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/ro_RO/LC_MESSAGES/django.mo b/locale/ro_RO/LC_MESSAGES/django.mo index d68465002fcecc5e0a00e26c78590b258182de0a..35ba27c9c5d9790f13c7c3a1a9c82b7646ff5790 100644 GIT binary patch delta 26284 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 delta 26601 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 ZNp($!y}}Z8jgE;rK6=lJE1o}+{SOT;27Ukl diff --git a/locale/ro_RO/LC_MESSAGES/django.po b/locale/ro_RO/LC_MESSAGES/django.po index e4059f28a..dc3a61a7c 100644 --- a/locale/ro_RO/LC_MESSAGES/django.po +++ b/locale/ro_RO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:11\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-02 04:10\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Romanian\n" "Language: ro\n" @@ -54,19 +54,19 @@ msgstr "Parola nu se potrivește" msgid "Incorrect Password" msgstr "" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Data de terminare a lecturii nu poate fi ÃŽnainte de data de ÃŽnceput." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Data de sfÃĸrșit a lecturii nu poate fi ÃŽnainte de data de ÃŽnceput." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "" -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "" @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Raport generat automat" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "În așteptare" @@ -258,17 +259,24 @@ msgstr "Urmăritori" msgid "Private" msgstr "Privat" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Activ" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "" @@ -284,6 +292,10 @@ msgstr "Eroare la ÃŽncărcarea cărții" msgid "Could not find a match for book" msgstr "Nu a putut fi găsită o potrivire pentru carte" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratuită" @@ -359,7 +371,7 @@ msgstr "Recenzii" msgid "Comments" msgstr "Comentarii" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citate" @@ -968,6 +980,7 @@ msgstr "Salvați" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -985,6 +998,7 @@ msgstr "Încărcatul de date se va conecta la %(source_name)s #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmați" @@ -1486,9 +1500,12 @@ msgid "Domain" msgstr "Domeniu" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1500,7 +1517,8 @@ msgstr "Status" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2836,16 +2854,16 @@ msgid "No activities for this hashtag yet!" msgstr "" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "Importați cărți" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -2853,95 +2871,105 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "Sursa de date:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Fișierul de date:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Includeți recenzii" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Setare de confidențialitate pentru recenziile importate:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importați" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Importuri recente" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Niciun import recent" @@ -2977,7 +3005,8 @@ msgid "Refresh" msgstr "ReÃŽmprospătați" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "" @@ -3077,6 +3106,133 @@ msgstr "Acest import este un format vechi care nu mai este suportat. Dacă dori msgid "Update import" msgstr "Actualizare import" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Profilul utilizatorului" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3097,7 +3253,7 @@ msgid "Reject" msgstr "Respingeți" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Elemente a căror importare a eșuat" @@ -3882,6 +4038,16 @@ msgstr "a schimbat numele pentru %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "a schimbat descrierea %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Ștergeți notificările" @@ -4125,7 +4291,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Utilizatori blocați" @@ -4260,14 +4426,66 @@ msgstr "Confidențialitatea implicită a postărilor:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "Export CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Exportul dvs. va include toate cărțile de pe etajerele dvs., cărți pe care le-ați revizuit și cărți cu activitate de lectură." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4285,11 +4503,7 @@ msgstr "" msgid "Data" msgstr "Date" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "Export CSV" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "Relații" @@ -4780,7 +4994,8 @@ msgid "Active Tasks" msgstr "" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "" @@ -5178,9 +5393,14 @@ msgid "No instances found" msgstr "N-a fost găsită nicio instanță" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "" @@ -5193,70 +5413,107 @@ msgstr "" msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:102 -msgid "Completed" +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:116 -msgid "User" +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:125 -msgid "Date Updated" -msgstr "" - -#: bookwyrm/templates/settings/imports/imports.html:132 -msgid "Pending items" +msgid "Book Imports" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 +msgid "Completed" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 +msgid "User" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 +msgid "Date Updated" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:165 +msgid "Pending items" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "" +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6070,17 +6327,15 @@ msgstr "Creați un raft" msgid "Edit Shelf" msgstr "Editați raftul" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Profilul utilizatorului" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Toate cărțile" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importați cărți" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/sv_SE/LC_MESSAGES/django.mo b/locale/sv_SE/LC_MESSAGES/django.mo index c4199d723a428b4fc0831847994fe0a754510236..bc359e38b5ca03d97e095711d748c4b0aff19b20 100644 GIT binary patch delta 30384 zcmZwQ1#}fxqxSJR5j;R}Pk;b{puq|5?(P;KK#&kz4(?L4Xz}72AXtl}xO;IgEl?;> z+T!>BoV~e=b-!=cJN&l$%t=DZdwNHL1v?YC@1*dV>u^Q;I!-3sAL2Mw;yX_3W=eIO zKGBYo0sCS~oQgrX3{&F~%#1g&7QVw`Sf#(?RK#Ie8V_K8{D@64WPszea~!ubn!sTa z9^g}4J?UUdpnTA+ekl)8*n6*WZuaP8h^zZIA#j#A3-4HRL5D0!*LyEo@P9TYl-)r z?l=UU4AeS^YjH0|d}j=r={S3c-^Cwr!7Rt&m^dY7JI-d@hT5w3bByWdI!-L{i*s4R z#RMkLV>FoSd*cRV@=k&Ij?)#lV+G8xz;Om(YaEG}ki~KuFEn07r8i&XIN^95wPNMy zM4mvcWTPdH6N$In1nLr~$*{lR0@O?vupDJs(niY|HSt+19H%qB!Is#3rQ@`~7;KGx ztIXro9Xki z4?kl9^xeoTF)8wXax&R?5UO0LO)qKFE73gqhks&MXYXqT9^7yeaA_n1*WjDe6`GFZyAU?Ph`* zPy^128eqZgtbY#zMM%hs%P2TDcvlr9X*k=K}ia`G4pMIL<57(tN>4Ot#Ow`G%u9+==t> z1r~Pkak`)VBfjS+yHco*|FLnOpUoT7AKQ}N1l!>b)Jmi}z)I1-lZ$|6QUW!?vZ#Sn zK`mtyo8QIe_e5<;Kh$G4)H)UeiBCffWHV~1_uKrVHvODUzm0A+^n`$xB_7FAjH-}h%HT;o;Mws-l zDcBLUr`=H%24XZ$z_j=gGh(VZ^RyJi0OAc%D;b44e1lLEn2I{w3sGn6M^wK%Xq3PwNyP&4Gly+KI2eJzR1R7Q4OBKczDakAEE~O8r9AhRJ)0fnXL>&s)4ALn}(Xm zQdBz|Fd^=?9!7T}5>DHMYp82{GcLer zREJ5=8q=T#o&}R&K2$%Y+yuf1)I(L6f?BfKsF^K5&13~?={8yqqW1hUYOAhe06wyD zpL3>uGE}?iQ1t^*11^FZh`T%itw0@AL%mTm9)fx-M`0i?z@)erHLw$?6}X66k%#Dq z?@;Z;KX2Mef$BItHp6@vgyWDEa69V>BqQMfYLCyMD*TQb`A5`g_PJonr9rJoPSk)3 z+ITtC%xc*5Ca8gRMzuc#)!t;(R?k8oJ^!l-Xh!SNA7fAhID%^6I%-BQaR$D}iJQ*Rae>iOSJAO-G5&ES;v8fr-&Vko{sbsTir zENxL7NW3(r!X2pkCr~SN1$El*;u!p7(??w~-#1J_w<^RCP)7$)hw6-tUqsE|9_mm& zLk;v5dZEu%({X%MJDE`RgHbD*&sq#szZ_~{RZwTF-c{CL8BIxOjID79ZbPk1-fMhB z;zq2F!M~bs$NOSK;@7c)%3U`<8|sDM5syK2Q2B=aY(d34S-YcFvhNLg(PJ>01g*df zOoL0%A9tW;b`$uASOv8LlTn9mHkQRjs1>+@TG>Z#0!InF zM0K?5mZ^9cwKAtrOMU^>;Ui3qf7|p#x6J@DqsryQlvoZmfkvnag`*}o40Sjs+kE!| zo3H`Z@Ltr?oVVUbReX&axpT*u2-Q$3)Y4{04KNR;!cwT2*Td}C40GX7)Ie7v6LdSf z2xzJHqYlpzREH<6zoI(&4OQ+fs-w@SrA~U+45$%mN!y@SvKwk^qfsj{3RQ15>V>xw z6Y7*5A)tciurA)h01UZj_Oupi09{cH4?wNZXiSf@Q7g9zHPblM44H%tif7$pKR6BkT%^Avo zIun5yhDA_Y*$3Sk;Sd7Za4K%aEw~xmKQav@du&FW8r4x&)Seea&8#?TpmkAu9*Mr# zA2rjVHa-D0uxY3>vhXqMuK{c!K}&iFL-8UON8jH}g)*3*cuiCXgHiQHVFsLy8F4da z!jq`8@&vW#f1%oUo|vB__@nZxJz@QoQQszXKrL-|)Drba?WG$v;#nAhYi!*Achg}` z)XXYb>!a$oL0{~OTDeG6`@>LMGQmwid$RM^R71X$-~-s1Dv^R*e6LS%KWB z8HQnYtc4nIZ`9U|Ms>UZwMA<&A0ER5=zdEeGl9>j0c3h=EQvZ3O))JFMy=FLR0k_i z4eqq@%cy}pK@B9~Gc&M!s4Xgk+OpJiqd;1ot;P^i` z@rcAOolPm zIMmW#Le1zA7RKjT9s~a}9d*E@#Ji(rIv6#Ok*F=4Y~w3X?QBH1AAubNS#mFVxCSz+jw)A-D@Qpa-bK{rnZ{uMxi@K?87J zn=MFc&4{5S2c!116>8*tP)j?=#z)!sBpaWFYIh-OVCygk?y>oItxsOF{+hu{64YSA zH)f_OP$Lbp=10xA1SZCEm;!5I5Vl1f(lMwGmtrE^f-1ik)!tE5JLhfwH8%k*)dQRH zJL*)wL{&`sw;5Ol)RJXKH4uzii2|sZ7Dv6?tD*)r+Bz3iZ!IRlO;`~3Vt#Z#BcP?v z@YXaGjGlKo79zba=EISw1~#KQ+=rU!Nz_1Y*!&09m#CHfh&lsl{xSWOLrtKLiMyS~ zHlZV`!3Y~4Y~v#_73tquSEFZ1Q3E-O8rT)|tR$*~-!T+lqF!X#{x$FZDwv!2P)wue ze>DMhupjj%ynyQ9C2FZYpgPL?pBZ2nYR0utXQmPAscDUBcp#?6<)}T6MYVqjbK+G@ zho3O9p8quOOb6Mlg;1~3@~DnFqB`o1nrT1OOh?-Ic+`w%+xSA9PJ9jK#bWPGJDsdO zPy_0R?f?Q438>+*7#sg?fyxp&EXG{`eXL(dU!d;~c2;=2!x|quN=C z+PbZ%86Q9m=rXF`d!JZ;Rd`B5Va)#7RBVQ-*csJuKh%iFp=LT8)zBK$z+x~H#-Uc^ z9_GNusE!hUG3}*Btz-~tfO*{nwA3Xr63d`Y>jq4YXHgB`MV*0SshfrXe;SifQTJsYpOChL)%m7=@bY zBvi#&sDZ7p`7zdgn3?oARQ>y?0VIg$@*J*I)~u*@^P}1;X03{DHQbbdPGeV8$I+-2 z8IBt91RI}@YG^*H+%nXQY8|SbQ8QP&j~d8I)L}V``Y?Hg8c0w=m*;mwir`4%qp&1;C2~0zurw;3G_lL`nNS_` z5syNx&@!98+f5*lga@dRdnYjiNP!w@W@`}EBpzZNfP;u1!u(ju&n$5SHYYv-)zLlN zj{l(^yA4Ur<9iUbHSS9UY7qDXCt=}aF3)d1{Df7Amrw5U{Hnxw)QrmdyF7o>IS5-4 z&zHii&_wJ@d;{u*l{uvuP$|@7*c>&0MYsaDA}j888l^HbZi9N^bVJR&7wSy(x9P)C zhinY$l+VEhE|wCtC8g4s_eD)?LcAU}#?`2^@E-Mkh@aNw`7vBp^w#s=lz?6|Em4P} zowb{_FY0UzK@DiEbtk3rEXHWyZirV`-sP<;2H|b092=O)OR)xq6 zrs4q9>35?lOvZUQA6sF8jAo^#pqBJIRJkQKzQMX1Gm?J9#_yw6_WS%TOzkHnVxBXF-*(ifX4m>Ws9o@$RVSzaQ%98i(p< zj*Z7==K0rSaFhg%@D^slSE!jK&tg_23#y^qsPr(@r(g|Kz1FC`?u%+~9O{rRvaUhZ zk3kLe2z5P1LDwh}xo_I3ACq22wB3 z<@up?IBF~3qE>QhRx=T|cQ&(x{;0#05p{S%P#qOU&A24$E2V0vnT^C^I2G$-9OlAQ z+07fVG^(SYuqYM@G6U?6kBA>d4z1hSki+HqyWguAM@F8UE@v{nz+Z51F7x?bHrTv! z=c3+t4^S^0|J*LmU$2kB>Pkm#VMreH%C3p}m>!N5a0xcVyO>YUe`ts)&>r<+G!jSR z3RH#cd0n0#N{3?z@q1VhljJi?Tn4prjW7pxLaoRo48$8)6F;ENNY(u2OSP8hdHyF5 z&|c3$E$vbp-++3t?7|j!1Ea7=0kf2AQ1!eEnk`C-jfiJLrT0P2bSP@zXE6`H#|D_A z5YN9Ji-82x@p#msnT1-iwWvdR9CZe+pdP=6SR0?B-u1;p&GX(E)j=QB*;#~YcRA`z zZ9*^HiG^@?D9?XK0#8ZM<5Z`xso37y1+}z2QKx?x>M)JNF1QbaFk2Dx#cMUJOS})( z!~<9f6BTtib+9ffz8E#Ydqv%*;onHmNME7`@&N-eX)!bN0;qTyRK>Qa0d+>rEYha; zM=kYGY>jJd+^4w9nMJ%Hs$LxG)AO{OKt2MwN|;mJ1hvFFus!ZWb&#o~`P2%+aN;dc z=?853F`NDowZt7unU2CSlz1=fgv)KZZU1cFJJhgI+Z>ah4$F<-4V!fLEYFVxxCRn?`x1aVHFKJV9(sTa;cRL6Hw zXP|g>^AvSLt>hR~KMOH0#-Zou|9=tCjFQwa9cDpwR1)=g*2XYwh0*vu>iJGm)8wZ` zHJB6i>DLJL@!J`-MI%ukQVTH(x1c^Fven}G&rV<+fi-vrf5iT^jhX7WoY}vG=UAGir`*W;bfX`52toc5T8F3+#oCU0c&PvAz%4Qy--YQmRn#4li1?9r6xe<^`W zO-+G*&0L;e6b@`|JdN|oAJoF-97q3_F6Sq_f%|cOD`S(^F3;}`r)cBy{Eg^-+(Lel zwkH1(?jyduov}@Om*@A2(|2&2r8wNd<&2|1jgH21sHJMs$>o&C<2VQtb~gE=tqHCa3h9Zuny;$oSp&P7PsR1vmi(;l2=<1toboSFyMGFj|2fiC;oBT&$1z?3j!CmTM2{>|DnDSfj7YDTnSs z1oSH1je!^tWd>9p_1re;=kokD+YB5{{4(lA(k$A1Ebl`d))f8COmpBE;#+Vk79L;* zbPz*{2MjciYeVEs>UJg(V8YG})ajjt`kHPf>V2>Y^%U$uDmcec&+l2(tMm@)X?TJ< z<*!lY;tw+I`C&TZSx^Hlj(T&}M9<&K+n>lp5M!;=lvOKK;DDx z%u)F{Py;B9nn(lGW7yF;0yThzsK+i?I*!O{f*hGSsx2AJtAp^uyMuH)ePA{QduO0{Uun6KZ6qP#;3KQ8RsnT9G%X z22u_)=~+=*P!MxrN%X-EsIBXQNiYhvLT=Q6=b>KhYliXsS0Qkd1btX!9d15^!cjAw zh+(({_55B(z02p0FrS98s8jzOHSl^o&e}3P)>`Uer~%DD4SbG`uRuM{Yup5i69^n> zK4hAsDy~A!EY^AuR}nvfaoB4VXNJc%bhOL!H>G99nDWn2Gk%Ne&}*zYY{^k8k`DD* z5rkTiN^SyLx|SG>qfuW{Z9r8xj@p{bsK@HHjSm=SmU0g2?5svLxCd45JZcMXVGewV zI=l(To0ZCnS{Zj?0@~ves2Nv79iIB=`Bn^56Yq}Nl98wtnv34J*5+?SZNXvGfG(p} z;&;>p-l876loQOCW*M=$p8qZcRN(*~#Y?Dy3n!WpuR!JR#UgkXHFEDsW{DG^W}3#v zGh=?@A*i#^(&qO^O<)*mg=V7X_kWiV(5c*jJ#jzQ#@v(5*8u}?H}PMvEPFnDiup!k z|5VeE?=&+If7D6_U|r0QdK`yaUtl)k?WUW@aWux$^S_vYX1o&Bzy{P7>_yG=Bx;7| zP+M{p^}@P`n#nT^!hca)lWB%2SHM~lHStTNhZjT92WY@(xzS zcc>Ri>F>PInR13bjPNIXj@XbU3Qr>8O=mh+5fosK8k(o>@v%8F$$6boPZbuDpAL>)>7^hCsIL6>`(sZb5I_f1eEZjG8zIBG9@qn2n4JVqUo=hhFX zl}WVHbeIw~;OwZGhoBlRjyiO;Y`i0?+yK->N1)oDfr<6}&$AgTP!(fPOLG!6vp;b) ze!@Upxyq#ff?AQwHhu@S0xwW2=B(!Ng2Y%Jr=TWu8nr?DJECUN7iZ&O)S>iSW6EbotxzcH)g6YzusLd=S1=FWMfH$&*2Ih(%@-V9Py_JUWM0jFs16IG22cuh zXe*<(s@*2HnQ31V^x-qw7Fdir<*^uuN3b;hhWePzzS*3CFjRxJumyHOE$uGW8BKqavsksE2B}y^Tkr&dLbX zQqIR*xC1qTTd1vgY4zD@o`UqKb^=iK@+w`=e{}*HQC-}NZBeh@^t;TfGYmTtpN~3R zA5aa&k2PDC3Uye6Q5_dUouOJb-Vn2dChkEn%M4h21)WF7|2K+s$ zUW}W7Mi_^xa38f~Pf#;|fm(^cpUuzt3Zn+r88wjMSO90+cpL^2zi#92F(>il2h8a& zjv8Pj=0*1q0{IB6K^44$h4CY5Nedn{D^Lfu^qo-^hoQD$9clo-ptkUD)WC8bGKaW~ zwH;~;MxoBqKI9C!onr(vqx-1S`yTZ;B|B`s1}u)+qV`x2BQOUpL@nV#)agHu+NwLK z!}b<6Q=d4K?~m#@0GnZmN1nei1XS=Q>eKCa)D}EL9mdyK0SogYP^Fuq2e*5t=c!$GJ46-K>s ztD@c;bx{NEhk753K^@{H7=kM?Kb}Jk>@%vq?+MeM-wFHme;^4OXbg&HEOA{ zqdE#fEp=(s*=UIBIKny*)!{hQ(#}HFpO0a<471@a)R%5wuppK`XI{aP==uA2WrWWpjPHT)K;at zK!19XhXPmZjB`VB{TDksP6*`VM8p6TGENu@30o}`KTp-gj%tusP}+#*$g;2YQSkx zE07b%U~$w6?L)PD{xZ+MX8J1$n#pY(hfh$i(8w!hsRp2)>&ciK7h`2Sih2qXUp0S! z5QN&AZm2Ejhq-VhYJh7|E4mx?COvSK=f4Pn_atbE3S2WI4?{iAHBlY6L2XfQ8=ruh z`2y5ZZb1$BGOEMds0sQ0Y6g-F)o~_NdUk6*H-Vuf6vvzxgF5XuFbBRu&r)7DhbJfM z%~cgOz|N@CJ`i;_Vo*zb2vzSY>a0Ar@h_+?PkO^_jXN8GU=j+W9*@?jy`6?yve`HR zSE5!TA~Sue5GKedV(c^Winjujk+Qmf5o+sF9XK9gY^L z3LQ`l4@ZrBJZf(jVpCj$TCvaA22tG|(Z zKr>#6n&}4gyf{z;Ib!p#S?{6-^aQok-uFyL!Ke<3qXt$D)m}r?*=S{rK(#**-8w`Q z3220iPy<0$ZFoA_+48_@)=9&51t@U`6_#4z$uX~@noD=v7HK1dE zn&&vf3-jan>ZqB;q4xMWYNgV=G<)9@R}&wH+Jcb3JX`5@iV@I^tD^R(HtI|?vhg;k z!_yh{!WoWya5-~PhqK#j^Jy84t%(oDws;kFW{SQs^($c!;;m5wn2DaB|1Bn<4%ga@ z?Kb`sYHN<6I=YHFbPq5GzOknN+swQiYJlBPOFa@*ZxQOnw#Ir0bvSP-U(f%a1T=tm zs1bX=H8b)@rKdq1zChGzE`~a+4KW{fMb(>YU5RnTx1l=f|Bq>B0=^?Y6ZN8+@-NT7 z0`m!IiC3dK_!-yX4eW?x|1(SW1ob$+M!h%Uy)%zvdQ?ZbF#yACdMnf`xQET3frW@K zM-BMWJDz{N2=0@hrS^YsIts)R#6vI~JENBJB_pU?bvbH<*P$N6BW?mZjZbZXw>JI>HIoFNOnwT~(~;T6gHYcu6u@p+7pGw? zY64Y0n_o<5jC#DiznEW0`T_L@&BM34YTsRofM!@3^#W>wKG+sDlTKI-``G;5s6%%M zTj5L8Qr2>Ld4Auw2lgcX0QKIe=jG)Y;4IV|@&gvfSKeNFkGP%OK3<-G|8p2>q~(0Q zXq>}`?QwBDFVFAsf5I^04dZ)xetB%V^&hN5dfNnEo~7Q1I#WkbTlyADW6FeHp1+o_ zkD9o!Y^Py*!6<1M2a6gj&jXm=_Z!@p9T> zG1RBtJk-GUpdR1&ex~Ehs4cIBp5Om%ssIU{P=}@us=;A61lJ+sbb^w4dA`C~g(~lr z%xqmU)K&zd_H-CF!11U<_ABaz^$8ne_T*;ZgV6Ku|4byHFQH~*R$Pxd6Q@xFx{Z28 z|ADpeCF+oc`J0*4#1P_5P^Wwps@^2jp`D9fxEPD#Qq+6piociJQ=mi&Q?MMWqpGMS zu8lgB9WWHTV<%jKdJJ7D&0eQOEp;WVfiqEu?Bx*qWPy;=j%59eNBnf(s zuc21pDf(fO)H)>m_noMLg`t+X0;+*p)<&p9)e80DGYJdg@3;!nr!gz`Gqxmt29+P| zPV41#AkYH!*zLoico4P6rPFzNzA~zTorw=eb^HK};Zy92S<{>PlTZVnj(Q3fV|zSp z)ARA~wCcqbhI%8q>k-i5=!Y)U<- zwEw8X0yx=Z&;#2TK_{F3;Hra9Y0w)l z5-)GlJ(>JbhK`=AaeEylJe9j7cPr}YI!O2@!b5FbX+8Dd-)p&ZYjgk4m5a2)R2ofs z7#&u@N_OTdnt^Z;JCM${(XGm`S2TIGzUize<;!zFqRqP8x}LdhAcn%TxvNuP6!O~E ze+=)r3Q#6KgQ?7&os{D=x{7>VdLtg<&O)7wwygp-?-yK1T1(XB;1Yk7Nj5L?#QjHrL`2D zJ)n%P=aehKfYRV9{r6XM2P3ag+{Y;NnfOZX@l@VUT1V10 zP+g*xaD zt}C{Z!qq8Q*2X(vR^qx2QTgFF<@yodO#BgfdC-Sh?!I`Y3><>|bYt-tb{biSl;%8|Yb zGuuIArv2iCt5Z(Df9ko;*p~RN%Gp3>6*7M!T!n_a5$|I2j}cx^dNCS}B5fn;HCu~v z{LgbOq>QfI24^efXA@3t3(TVJ!(Ruf{)bcH4tHt_>e^;-{-yE7q*WzvAZfP<|4CXK zo4=p*N8Gw5(BNELNq!dQW@>K0x#SRVtT0&nHo7D|fgjg-<9u(q^P}qr-kQ)P{SgP2WcN z6nTAd5p`x0{y@XW$bUgtR}b=ZrRL_R?w+d;W%xFb|NfJ}Dw2LS>7GA#Q89>6M)INw z>kEpnR}tc0ug2tOw+)sgaTy(rwVADLxoM=GwPi}#6`V<0SMKk%|Nl_o9Fa9N){bz0 zjI;$O&`1~JdbWDe$Tsf6q-DZuwgdIoiMy}ugr7?|%WR&$M%2~Y@V|fVqRp96v#lQn=qekxCnXmxpj47z`8!+c@yN{3owCS;Q;Bis29tW^M|EQn&|&^o^*lQrxv@>;!pxN!N9iZ~@z?;_-<8V)GQ|OM9m_b!KB$ zI^gF|o@+5_JxRO4J%*Hz_#Jt7N&gYuYY8MHkcPWHnP0Ci#1oJ=z@}xQ(avQ4Kzakh zvryM>42o~*_}38l{2*-r@ip9~iQmOGxP|;i+&KuxP^P4$+u)q_M`7;Y)w#1>tq1SG0M(7|><%c5-pdgg=u%2z5mgzDKy7jn}8#2cicIMo*A7oQ7}PiWwCrT%L+$2v^{~NoOf2vzN3V zF^}zhHU7rkmNIv3ef1YkxG8Px+D85m>TIWfCqD%Tk&ukcVuW?o;~q?!u23pY!&^4b zn~J)wV`}Q8ApJG>ew)6Qy!p#+xVIkToNciiun);CY)w%KY>pw+O+KgZ- z{!2Us6}`A$l0J|I{v)lCEwh~T5W?$i{H&ev0LuMAxpg-EIpLqUOA!CpmLcl7_#ue1 zlAk|#t~E5Ms~ruzBkV^7Wfk?Lvd8#0_a7uSBtOQchY;?-eVX(L(gqNo&wZcpMbh{Y zu;=Py2b7-pPlN+WT}@x^+!XR5F-i@P5kjJ_AXXtGey|ml_K9*UxF1vY3V!6)b&oos z+;2($m-3BBTT6H)`CEv8#~n@DNA3~ax^j`1Nc&&H#65p|VS^sx(?C`#ZnB*yaSWXV z*#XYQ|H#+XiLy1gbqywMGWN6a($p_RxHoq&_c-z+Y#W|`|E~ds>oMDrWLDyCL4hn3 zxQ9O@uL#eT)4CdOaA%HRGvckrY)mtOUd`L@t?3Kjq8V(?@52ct!oc< z#J#k!+>^rOp3~TA5=PpDtKT#_m%NWu%1jitv3&|D8pQCX9@{Vh(uE;D>fm%g!_&y@s-vLBnyo-wFyNipWMz&NjC|{Vg=Ig zp%3wtsB02wHMw;);|`!5{=SPJeA)HSM~Awuli0w{s6S~*?Mx<;SJyUBobXFqCXh1S zY*_Vm4dV`=^X=RpZM#bUqCdFakv@*Lrf^Tw`@g(xI6Gk%_hsUTDR`NJAvSLaasB@R zH6Z^E9d^b<#QCwFla+X8%Kl1P3*tE$baCRx?ZE0`cj9^MWI9sj>*a1p;{0zC64A(8 z3eO;I5~WIiEs2?J17DNc5wB|P z($G%s9<~vFQtG6!;WeaJ<9@&Zr_o43>~058lW=|R_@rl}om`Y#N?vc$bS>mgPg*h3 z`p{mKXJGUnMPwL>#YyN(p?8G)QSdj_`sP|k`fJj^y?Rr3siz^nPp}#7iI<|>DDIjz z?=yoaOa2?;VYH(w369tPFC=py8P#ou$>xc$v(7;N8xj|DA0a%9dkOb7%IBv332t3u zX=4I+FB5et<393!wDE+t{a3cUl0EBRk&c?%LgF}$r=idgD%8i)#8Z*pl=x%9U#}>_ zgNekE?oY?pZC+Y*aW|&jqSTKi{FyQhZ2nBjjv$=w>;4}jl7@z2DU^@!HCs>}m7sxw zr0Y6E`dz|*nJE7loe8+;Xe#0Hwq88SlqPK>*^3B2#--ft$S-WFc>Wx!pZ|`sjdZ1> zKniy!DBa2oiV`v>y%(S4BcF7j^^{(4OzK9G2N2B7N*_j;S3khH>t z_fxMk_Yu$jQ{nnI4R~ttM=1(4;okR6p31u^|B19rc7Us_WvuPUTSEN^%FX50HIF;k zhG%$E%pdOfR4PWsOWVm4+el*4a?rV=0py+Iu1I_<_hjgFRL%0(Y_9Nd#`T*O%Go8o+?o8aee&HTRp(Dg^QmH#jww&;K((@6%h8f9U zOI{h$^OLrPcp&k%ID&fuWe(uCS5eBPq>QdHc$xe`I{&AL%(0!vBlDmw^n<4;U)z&+ zpR@{8@S~AxgwqjDPX04yq-!+B;~q}l5h>}WeO6q zVKWl9eN%Bg;mq7k$dAKQxQu%XcM|U5bl9FcP4Vw<>ZPXPn&f|b?Ipj`H)SeQCmZEF z&wmh|f4#y8&#{p>JV>EmNxMq;65-TTEM&{iqQMb_>vP{By%)ExOT^Prb~E?a>-%py zFG+d`1Ltx(X~}5J{TGS1NqIo!#KfE61>$2!uR!5Vq$RN(v?pCx4$|A(PO?yb4EYVY zQ;}Yg{Jpk(D=c6-bjI8At;v6?=YI&9OKJQ(4a~q6+`5udur~K1(vK1!hhML3wy|R* z+_Me7!g;jS+Lrs1ytbs3BA%D@T!bguvdu{gR2!c4#|tD}q2pZ?d`i3~;eRMRNCTqa zTdYF7A$eZJcM@(z_&xV_>J}ue7Ipg**45W`r0`hk>gq`T3-WIgK8$mTd;0G|WFz-$ z?f~wK++VLYG~APdf6+*1(#vpPC4QTGv~5^rlM_xtSzS#jGl{!9_h#Y^>|kn=zlnPH zx$}~~LGOQGBAY2#4_AEC;9* zsQV{nbyX(*g!^x9f6_bn@YUcIB6+#Xk`T^al<;{>OQQ)*J^qzb8-T>5*XG_#8C~0P zH+4d}*HJE%yaTiSq61O}<_pXb9Nw#QpYW(o;k}}B_sfwZCM5cHm6$Ah)5e<}kAH)) zR7}2u1$<+g9f>RL9Wf+4Hl3F%i+7UnK7oZwIgO$*G?srR^hi+Z9KoF<`t|AAVQ{;i z;azAcP{cmZ?YiL`TcV(=z00pf@BUGN(Gij1LwffLkNv)o>$A6SH`4mW&ME3T=bIq3 zU|?uysn8O!J;GeOT>rnZ#RisfEvOZHZlWt^eE$xCog<>71AE5p>KERtcU0$6vCn6? zqI`WTcZlvE8QW&AYg*O#jiP%;^$hP3`^Qb!AaB3u@UC{)T^V-UyRNjk|KDNv7|Hr{r~^~ delta 30340 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\n" "Language-Team: Swedish\n" "Language: sv\n" @@ -54,19 +54,19 @@ msgstr "LÃļsenord matchar inte" msgid "Incorrect Password" msgstr "Felaktigt lÃļsenord" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "Slutdatum fÃļr läsning kan inte vara fÃļre startdatum." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "Stoppdatum fÃļr läsning kan inte vara fÃļre startdatum." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "Stoppdatum fÃļr läsning kan inte vara i framtiden." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "Slutdatum fÃļr läsning kan inte vara i framtiden." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "Automatiskt genererad rapport" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "PÃĨgÃĨende" @@ -258,17 +259,24 @@ msgstr "FÃļljare" msgid "Private" msgstr "Privat" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "Aktiv" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "SlutfÃļrd" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "Avbruten" @@ -284,6 +292,10 @@ msgstr "Fel uppstod vid inläsning av boken" msgid "Could not find a match for book" msgstr "Kunde inte hitta en träff fÃļr boken" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "Gratis" @@ -359,7 +371,7 @@ msgstr "Recensioner" msgid "Comments" msgstr "Kommentarer" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "Citat" @@ -964,6 +976,7 @@ msgstr "Spara" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -981,6 +994,7 @@ msgstr "Att ladda in data kommer att ansluta till %(source_name)sImport/Export page of your Goodreads account." msgstr "Du kan ladda ner din Goodreads-data frÃĨn Import/Export-sidan fÃļr ditt Goodreads-konto." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "Datafil:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "Inkludera recensioner" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "Integritetsinställning fÃļr importerade recensioner:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importera" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Du har nÃĨtt importeringsgränsen." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importer är tillfälligt inaktiverade, tack fÃļr ditt tÃĨlamod." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "Senaste importer" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "Skapad" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "Senast uppdaterad" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "FÃļremÃĨl" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "Ingen importering nyligen" @@ -2966,7 +2994,8 @@ msgid "Refresh" msgstr "Uppdatera" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "Avsluta import" @@ -3064,6 +3093,133 @@ msgstr "Den här importen är i ett gammalt format som inte längre stÃļds. Om d msgid "Update import" msgstr "Uppdatera importering" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "Steg 1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "Steg 2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "Användarprofil" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "Din tidszon" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3084,7 +3240,7 @@ msgid "Reject" msgstr "Neka" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "Misslyckade objekt" @@ -3864,6 +4020,16 @@ msgstr "har ändrat namnet pÃĨ %(group_name)s" msgid "has changed the description of %(group_name)s" msgstr "har ändrat beskrivningen pÃĨ %(group_name)s" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "Ta bort aviseringar" @@ -4094,7 +4260,7 @@ msgstr "" #: bookwyrm/templates/preferences/alias_user.html:30 #: bookwyrm/templates/preferences/move_user.html:35 msgid "Confirm your password:" -msgstr "" +msgstr "Bekräfta ditt lÃļsenord:" #: bookwyrm/templates/preferences/alias_user.html:39 #: bookwyrm/templates/preferences/layout.html:28 @@ -4107,7 +4273,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "Blockerade användare" @@ -4242,14 +4408,66 @@ msgstr "Standardsekretess fÃļr inlägg:" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "Datum" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "Storlek" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSV-export" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "Din export inkluderar alla bÃļcker som du har pÃĨ din hylla, har recenserat och bÃļcker med läsaktivitet." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4267,11 +4485,7 @@ msgstr "" msgid "Data" msgstr "Data" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV-export" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "FÃļrhÃĨllanden" @@ -4761,7 +4975,8 @@ msgid "Active Tasks" msgstr "Aktiva uppgifter" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5155,9 +5370,14 @@ msgid "No instances found" msgstr "Inga instanser hittades" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "Avsluta import?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "Inaktivera start av nya importer" @@ -5170,70 +5390,107 @@ msgstr "Detta är bara avsett att användas när saker och ting har gÃĨtt mycket msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "Medans importer är avstängda sÃĨ kommer användare inte att tillÃĨtas att pÃĨbÃļrja nya importer, men befintliga importer pÃĨverkas inte." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "Inaktivera importer" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "Användare kan fÃļr närvarande inte starta nya importer" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "Aktivera importer" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "Begränsa mängden importer" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "En del användare kan fÃļrsÃļka importera ett stort antal bÃļcker som du kan vilja begränsa." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "Sätt värdet till 0 fÃļr att inte pÃĨtvinga nÃĨgon gräns." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "Sätt importeringsgränsen till" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "bÃļcker var" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "dagar." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "Ställ in gränsen" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "timmar" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "SlutfÃļrd" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "Användare" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "Uppdaterad" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "Väntande objekt" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "FramgÃĨngsrika objekt" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "Inga matchande importer hittades." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6046,17 +6303,15 @@ msgstr "Skapa hylla" msgid "Edit Shelf" msgstr "Redigera hylla" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "Användarprofil" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "Alla bÃļcker" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "Importera bÃļcker" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6575,7 +6830,7 @@ msgstr "(%(percent)s%%" #: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid " - %(endpercent)s%%" -msgstr "" +msgstr " - %(endpercent)s%%" #: bookwyrm/templates/snippets/status/content_status.html:116 msgid "Open image in new window" diff --git a/locale/uk_UA/LC_MESSAGES/django.mo b/locale/uk_UA/LC_MESSAGES/django.mo index 5f7e5092ee9ae4fc704114cadbc04b86eb930609..3ca5833de00d9ef2e1e5d08e185b3a913e636267 100644 GIT binary patch delta 31520 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 delta 28280 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 diff --git a/locale/uk_UA/LC_MESSAGES/django.po b/locale/uk_UA/LC_MESSAGES/django.po index 2773aa023..f270324c4 100644 --- a/locale/uk_UA/LC_MESSAGES/django.po +++ b/locale/uk_UA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:11\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-01-04 15:51\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -54,19 +54,19 @@ msgstr "ПаŅ€ĐžĐģŅŒ ĐŊĐĩ СйŅ–ĐŗĐ°Ņ”Ņ‚ŅŒŅŅ" msgid "Incorrect Password" msgstr "НĐĩĐŋŅ€Đ°Đ˛Đ¸ĐģŅŒĐŊиК ПаŅ€ĐžĐģŅŒ" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "ДаŅ‚Đ° ĐŋŅ€ĐžŅ‡Đ¸Ņ‚Đ°ĐŊĐŊŅ ĐŊĐĩ ĐŧĐžĐļĐĩ ĐąŅƒŅ‚и Đ´Đž Đ´Đ°Ņ‚и ĐŋĐžŅ‡Đ°Ņ‚ĐēŅƒ Ņ‡Đ¸Ņ‚Đ°ĐŊĐŊŅ." -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "ДаŅ‚Đ° СŅƒĐŋиĐŊĐēи Ņ‡Đ¸Ņ‚Đ°ĐŊĐŊŅ ĐŊĐĩ ĐŧĐžĐļĐĩ ĐąŅƒŅ‚и Ņ€Đ°ĐŊŅ–ŅˆĐĩ Đ´Đ°Ņ‚и ĐŋĐžŅ‡Đ°Ņ‚ĐēŅƒ." -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "ДаŅ‚Đ° СŅƒĐŋиĐŊĐēи Ņ‡Đ¸Ņ‚Đ°ĐŊĐŊŅ ĐŊĐĩ ĐŧĐžĐļĐĩ ĐąŅƒŅ‚и в ĐŧаКйŅƒŅ‚ĐŊŅŒĐžĐŧŅƒ." -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "ДаŅ‚Đ° ĐŋŅ€ĐžŅ‡Đ¸Ņ‚Đ°ĐŊĐŊŅ ĐŊĐĩ ĐŧĐžĐļĐĩ ĐąŅƒŅ‚и в ĐŧаКйŅƒŅ‚ĐŊŅŒĐžĐŧŅƒ." @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "АвŅ‚ĐžĐŧĐ°Ņ‚иŅ‡ĐŊĐž СĐŗĐĩĐŊĐĩŅ€ĐžĐ˛Đ°ĐŊиК СвŅ–Ņ‚" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "ПĐĩŅ€ĐĩвŅ–Ņ€ŅŅ”Ņ‚ŅŒŅŅ" @@ -258,17 +259,24 @@ msgstr "БаŅ‡Đ°Ņ‚ŅŒ Ņ‚Ņ–ĐģŅŒĐēи ĐŋŅ–Đ´ĐŋиŅĐŊиĐēи" msgid "Private" msgstr "НĐĩ йаŅ‡Đ¸Ņ‚ŅŒ ĐŊŅ–Ņ…Ņ‚Đž" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "В ĐŋŅ€ĐžŅ†ĐĩŅŅ–" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "ЗавĐĩŅ€ŅˆĐĩĐŊĐž" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "ЗŅƒĐŋиĐŊĐĩĐŊĐž" @@ -284,6 +292,10 @@ msgstr "ПоĐŧиĐģĐēĐ° ĐŋŅ€Đ¸ СаваĐŊŅ‚Đ°ĐļĐĩĐŊĐŊŅ– ĐēĐŊиĐŗи" msgid "Could not find a match for book" msgstr "НĐĩ вдаĐģĐžŅŅ СĐŊĐ°ĐšŅ‚и вŅ–Đ´ĐŋОвŅ–Đ´ĐŊŅƒ ĐēĐŊиĐŗŅƒ" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "БĐĩСĐŋĐģĐ°Ņ‚ĐŊĐž" @@ -359,7 +371,7 @@ msgstr "Đ ĐĩŅ†ĐĩĐŊСŅ–Ņ—" msgid "Comments" msgstr "КоĐŧĐĩĐŊŅ‚Đ°Ņ€Ņ–" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "ĐĻиŅ‚Đ°Ņ‚и" @@ -461,7 +473,7 @@ msgstr "Svenska (ШвĐĩĐ´ŅŅŒĐēĐ°)" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文 (ĐĸŅ€Đ°Đ´Đ¸Ņ†Ņ–ĐšĐŊĐ° ĐēиŅ‚Đ°ĐšŅŅŒĐēĐ°)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "О, ĐŊŅ–!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "НĐĩĐŧĐ°Ņ” ДозвоĐģŅƒ" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "ĐŖ ВаŅ ĐŊĐĩĐŧĐ°Ņ” дОСвОĐģŅƒ ĐŊĐ° ĐŋĐĩŅ€ĐĩĐŗĐģŅĐ´ Ņ†Ņ–Ņ”Ņ— ŅŅ‚ĐžŅ€Ņ–ĐŊĐēи айО виĐēĐžĐŊĐ°ĐŊĐŊŅ Ņ†Ņ–Ņ”Ņ— Đ´Ņ–Ņ—. ВаŅˆ Ņ€Ņ–вĐĩĐŊŅŒ дОСвОĐģŅ–в ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Đ° %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Đ¯ĐēŅ‰Đž ви вваĐļĐ°Ņ”Ņ‚Đĩ, Ņ‰Đž ваĐŧ ŅĐģŅ–Đ´ ĐžŅ‚Ņ€Đ¸ĐŧĐ°Ņ‚и Đ´ĐžŅŅ‚ŅƒĐŋ, ĐąŅƒĐ´ŅŒ ĐģĐ°ŅĐēĐ°, СвĐĩŅ€ĐŊŅ–Ņ‚ŅŒŅŅ Đ´Đž Đ°Đ´ĐŧŅ–ĐŊŅ–ŅŅ‚Ņ€Đ°Ņ‚ĐžŅ€Đ° ваŅˆĐžĐŗĐž ŅĐĩŅ€Đ˛ĐĩŅ€Đ° Bookrm." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,18 @@ msgstr "ВĐēаСаĐŊĐ° ŅŅ‚ĐžŅ€Ņ–ĐŊĐēĐ° ĐŊĐĩ Ņ–ŅĐŊŅƒŅ”!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "ФаКĐģ СавĐĩĐģиĐēиК" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "ФаКĐģ, ŅĐēиК ви СаваĐŊŅ‚Đ°ĐļŅƒŅ”Ņ‚Đĩ, СавĐĩĐģиĐēиК." #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +"Ви ĐŧĐžĐļĐĩŅ‚Đĩ ŅĐŋŅ€ĐžĐąŅƒĐ˛Đ°Ņ‚и виĐēĐžŅ€Đ¸ŅŅ‚Đ°Ņ‚и ĐŧĐĩĐŊŅˆĐ¸Đš Ņ„Đ°ĐšĐģ айО ĐŋĐžĐŋŅ€ĐžŅĐ¸Ņ‚и Đ°Đ´ĐŧŅ–ĐŊŅ–ŅŅ‚Ņ€Đ°Ņ‚ĐžŅ€Đ° ŅĐĩŅ€Đ˛ĐĩŅ€Đ° BookWyrm СйŅ–ĐģŅŒŅˆĐ¸Ņ‚и ĐŋĐ°Ņ€Đ°ĐŧĐĩŅ‚Ņ€ DATA_UPLOAD_MAX_MEMORY_SIZE. " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -972,6 +985,7 @@ msgstr "ЗбĐĩŅ€ĐĩĐŗŅ‚и" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -989,6 +1003,7 @@ msgstr "ПŅ€ĐžŅ†ĐĩŅ СаваĐŊŅ‚Đ°ĐļĐĩĐŊĐŊŅ Đ´Đ°ĐŊиŅ… С'Ņ”Đ´ĐŊĐ°Ņ”Ņ‚ŅŒŅŅ #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "ПŅ–Đ´Ņ‚вĐĩŅ€Đ´Đ¸Ņ‚и" @@ -1492,9 +1507,12 @@ msgid "Domain" msgstr "ДоĐŧĐĩĐŊ" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1506,7 +1524,8 @@ msgstr "ĐĄŅ‚Đ°Ņ‚ŅƒŅ" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2567,7 +2586,7 @@ msgstr "ĐĄĐēĐ°ĐŊĐĩŅ€ ŅˆŅ‚Ņ€Đ¸Ņ…-ĐēОдŅ–в" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "ВиĐēĐžŅ€Đ¸ŅŅ‚ОвŅƒĐšŅ‚Đĩ ĐĄĐŋиŅĐēи, ВŅ–Đ´ĐēŅ€Đ¸Đš Đ´ĐģŅ ŅĐĩĐąĐĩ Ņ– ВаŅˆŅ– ĐēĐŊиĐŗи ĐŋĐžŅĐ¸ĐģĐ°ĐŊĐŊŅ Đ´ĐģŅ ĐŋĐžŅˆŅƒĐēŅƒ ĐŋŅ€ĐžĐŋОСиŅ†Ņ–Đš Ņ‰ĐžĐ´Đž Ņ‡Đ¸Ņ‚Đ°ĐŊĐŊŅ Ņ– ĐžŅŅ‚Đ°ĐŊĐŊŅ–Ņ… ĐŋОдŅ–Đš ĐŊĐ° Ņ†ŅŒĐžĐŧŅƒ ŅĐĩŅ€Đ˛ĐĩŅ€Ņ–, айО ĐŋĐĩŅ€ĐĩĐŗĐģŅĐ´Ņƒ ваŅˆĐ¸Ņ… ĐēĐ°Ņ‚Đ°ĐģĐžĐļĐŊиŅ… ĐēĐŊиĐŗ!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2599,7 +2618,7 @@ msgstr "ĐĄĐŋОвŅ–Ņ‰ĐĩĐŊĐŊŅ" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "ЊОй ĐžŅ‚Ņ€Đ¸ĐŧĐ°Ņ‚и Đ´ĐžŅŅ‚ŅƒĐŋ Đ´Đž ŅĐ˛ĐžĐŗĐž ĐŋŅ€ĐžŅ„Ņ–ĐģŅŽ, ĐēĐ°Ņ‚Đ°ĐģĐžĐŗŅƒ ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Ņ–в, ĐŋŅ€ŅĐŧиŅ… ĐŋОвŅ–Đ´ĐžĐŧĐģĐĩĐŊŅŒ Ņ– ĐŊĐ°ĐģĐ°ŅˆŅ‚ŅƒĐ˛Đ°ĐŊŅŒ, ĐēĐģĐ°Ņ†ĐŊŅ–Ņ‚ŅŒ ŅĐ˛ĐžŅ” Ņ–Đŧ’Ņ в ĐŧĐĩĐŊŅŽ Ņ‚ŅƒŅ‚." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -2846,16 +2865,16 @@ msgid "No activities for this hashtag yet!" msgstr "ПоĐēи Ņ‰Đž ĐŊŅ–Ņ…Ņ‚Đž ĐŊĐĩ виĐēĐžŅ€Đ¸ŅŅ‚ОвŅƒĐ˛Đ°Đ˛ Ņ†ĐĩĐš Ņ…ĐĩŅˆŅ‚ĐĩĐŗ!" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "ІĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°Ņ‚и КĐŊиĐŗи" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "НĐĩĐēĐžŅ€ĐĩĐēŅ‚ĐŊиК CSV-Ņ„Đ°ĐšĐģ" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -2864,95 +2883,105 @@ msgstr[1] "НаŅ€Đ°ĐˇŅ– ви ĐŧĐžĐļĐĩŅ‚Đĩ Ņ–ĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°Ņ‚и Ņ‚Ņ–ĐģŅŒĐēи %( msgstr[2] "НаŅ€Đ°ĐˇŅ– ви ĐŧĐžĐļĐĩŅ‚Đĩ Ņ–ĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°Ņ‚и Ņ‚Ņ–ĐģŅŒĐēи %(display_size)s ĐēĐŊиĐŗ вĐŋŅ€ĐžĐ´ĐžĐ˛Đļ ĐēĐžĐļĐŊиŅ… %(import_limit_reset)s Đ´ĐŊŅ–в." msgstr[3] "НаŅ€Đ°ĐˇŅ– ви ĐŧĐžĐļĐĩŅ‚Đĩ Ņ–ĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°Ņ‚и Ņ‚Ņ–ĐģŅŒĐēи %(display_size)s ĐēĐŊиĐŗ вĐŋŅ€ĐžĐ´ĐžĐ˛Đļ ĐēĐžĐļĐŊиŅ… %(import_limit_reset)s Đ´ĐŊŅ–в." -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "ЗаĐģиŅˆĐ¸ĐģĐžŅŅŒ %(display_left)s." -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "В ŅĐĩŅ€ĐĩĐ´ĐŊŅŒĐžĐŧŅƒ, ĐŊĐĩдавĐŊŅ– Ņ–ĐŧĐŋĐžŅ€Ņ‚и СаКĐŊŅĐģи %(hours)s ĐŗОдиĐŊ." -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "В ŅĐĩŅ€ĐĩĐ´ĐŊŅŒĐžĐŧŅƒ, ĐŊĐĩдавĐŊŅ– Ņ–ĐŧĐŋĐžŅ€Ņ‚и СаКĐŊŅĐģи %(minutes)s Ņ…виĐģиĐŊ." -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "ДĐļĐĩŅ€ĐĩĐģĐž Đ´Đ°ĐŊиŅ…:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Ви ĐŧĐžĐļĐĩŅ‚Đĩ СаваĐŊŅ‚Đ°ĐļиŅ‚и Đ´Đ°ĐŊŅ– Goodreads ĐŊĐ° ŅŅ‚ĐžŅ€Ņ–ĐŊŅ†Ņ– Import/Export ваŅˆĐžĐŗĐž ОйĐģŅ–ĐēОвОĐŗĐž СаĐŋиŅŅƒ Goodreads." -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "ФаКĐģ Đ´Đ°ĐŊиŅ…:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "РаСОĐŧ С Ņ€ĐĩŅ†ĐĩĐŊСŅ–ŅĐŧи" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "НаĐģĐ°ŅˆŅ‚ŅƒĐ˛Đ°ĐŊĐŊŅ ĐŋŅ€Đ¸Đ˛Đ°Ņ‚ĐŊĐžŅŅ‚Ņ– Đ´ĐģŅ Ņ–ĐŧĐŋĐžŅ€Ņ‚ОваĐŊиŅ… Ņ€ĐĩŅ†ĐĩĐŊСŅ–Đš:" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "ІĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°Ņ‚и" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "Ви Đ´ĐžŅŅĐŗĐģи ĐģŅ–ĐŧŅ–Ņ‚Ņƒ ĐŊĐ° Ņ–ĐŧĐŋĐžŅ€Ņ‚." -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "ІĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°ĐŊĐŊŅ Ņ‚иĐŧŅ‡Đ°ŅĐžĐ˛Đž вŅ–Đ´ĐēĐģŅŽŅ‡ĐĩĐŊĐž; Đ´ŅĐēŅƒŅ”ĐŧĐž Са Ņ‚ĐĩŅ€ĐŋŅ–ĐŊĐŊŅ." -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "ОŅŅ‚Đ°ĐŊĐŊŅ– ІĐŧĐŋĐžŅ€Ņ‚и" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "ДаŅ‚Đ° ĐĄŅ‚вОŅ€ĐĩĐŊĐŊŅ" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "ОŅŅ‚Đ°ĐŊĐŊŅ” ОĐŊОвĐģĐĩĐŊĐŊŅ" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "ОдиĐŊиŅ†ŅŒ" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "ОŅŅ‚Đ°ĐŊĐŊŅ–Đŧ Ņ‡Đ°ŅĐžĐŧ Ņ–ĐŧĐŋĐžŅ€Ņ‚Ņ–в ĐŊĐĩ ĐąŅƒĐģĐž" @@ -2988,7 +3017,8 @@ msgid "Refresh" msgstr "ОĐŊОвиŅ‚и" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "ЗŅƒĐŋиĐŊиŅ‚и Ņ–ĐŧĐŋĐžŅ€Ņ‚" @@ -3090,6 +3120,133 @@ msgstr "ĐĻĐĩ Ņ–ĐŧĐŋĐžŅ€Ņ‚ ŅŅ‚Đ°Ņ€ĐžĐŗĐž Ņ„ĐžŅ€ĐŧĐ°Ņ‚Ņƒ, ŅĐēиК ĐąŅ–ĐģŅŒŅˆĐĩ msgid "Update import" msgstr "ОĐŊОвиŅ‚и Ņ–ĐŧĐŋĐžŅ€Ņ‚" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "ПŅ€ĐžŅ„Ņ–ĐģŅŒ ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Đ°" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3110,7 +3267,7 @@ msgid "Reject" msgstr "ВŅ–Đ´Ņ…иĐģиŅ‚и" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "НĐĩвдаĐģŅ– ĐĩĐģĐĩĐŧĐĩĐŊŅ‚и" @@ -3779,8 +3936,8 @@ msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[2] "%(display_count)s ĐŊОвиŅ… СаĐŋŅ€ĐžŅˆĐĩĐŊŅŒ ĐžŅ‡Ņ–ĐēŅƒŅŽŅ‚ŅŒ ĐŊĐ° вŅ–Đ´ĐŋОвŅ–Đ´ŅŒ" +msgstr[3] "%(display_count)s ĐŊОвиŅ… СаĐŋŅ€ĐžŅˆĐĩĐŊŅŒ ĐžŅ‡Ņ–ĐēŅƒŅŽŅ‚ŅŒ ĐŊĐ° вŅ–Đ´ĐŋОвŅ–Đ´ŅŒ" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -3900,6 +4057,16 @@ msgstr "" msgid "has changed the description of %(group_name)s" msgstr "" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "" @@ -4143,7 +4310,7 @@ msgstr "ВидаĐģиŅ‚и ĐŋŅĐĩвдОĐŊŅ–Đŧ" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "" @@ -4278,13 +4445,65 @@ msgstr "" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "ЕĐēŅĐŋĐžŅ€Ņ‚ CSV" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." msgstr "" #: bookwyrm/templates/preferences/export.html:20 @@ -4303,11 +4522,7 @@ msgstr "" msgid "Data" msgstr "" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "" @@ -4801,7 +5016,8 @@ msgid "Active Tasks" msgstr "АĐēŅ‚ивĐŊŅ– СавдаĐŊĐŊŅ" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5203,9 +5419,14 @@ msgid "No instances found" msgstr "ІĐŊŅŅ‚Đ°ĐŊŅŅ–в ĐŊĐĩ СĐŊаКдĐĩĐŊĐž" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "ЗŅƒĐŋиĐŊиŅ‚и Ņ–ĐŧĐŋĐžŅ€Ņ‚?" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "ВиĐŧĐēĐŊŅƒŅ‚и ŅŅ‚вОŅ€ĐĩĐŊĐŊŅ ĐŊОвиŅ… Ņ–ĐŧĐŋĐžŅ€Ņ‚Ņ–в" @@ -5218,70 +5439,107 @@ msgstr "ĐĻĐĩ ĐŋĐžŅ‚Ņ€Ņ–ĐąĐŊĐž ĐģиŅˆĐĩ Ņƒ Ņ‚иŅ… ŅĐ¸Ņ‚ŅƒĐ°Ņ†Ņ–ŅŅ…, ĐēĐžĐģи С msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "ПоĐēи Ņ–ĐŧĐŋĐžŅ€Ņ‚и виĐŧĐēĐŊĐĩĐŊŅ–, ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Ņ– ĐŊĐĩ СĐŧĐžĐļŅƒŅ‚ŅŒ дОдаваŅ‚и ĐŊОвŅ–, Đ°ĐģĐĩ ĐŊĐ° ĐŊĐ°ŅĐ˛ĐŊиК Ņ–ĐŧĐŋĐžŅ€Ņ‚ Ņ†Đĩ ĐŊĐĩ вĐŋĐģиĐŊĐĩ." -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "ВиĐŧĐēĐŊŅƒŅ‚и Ņ–ĐŧĐŋĐžŅ€Ņ‚и" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "НаŅ€Đ°ĐˇŅ– ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Ņ– ĐŊĐĩ ĐŧĐžĐļŅƒŅ‚ŅŒ дОдаŅ‚и ĐŊОвиК Ņ–ĐŧĐŋĐžŅ€Ņ‚" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "ĐŖвŅ–ĐŧĐēĐŊŅƒŅ‚и Ņ–ĐŧĐŋĐžŅ€Ņ‚и" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "ОбĐŧĐĩĐļиŅ‚и ĐēŅ–ĐģŅŒĐēŅ–ŅŅ‚ŅŒ Ņ–ĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°ĐŊŅŒ" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "ДĐĩŅĐēŅ– ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Ņ– ĐŧĐžĐļŅƒŅ‚ŅŒ ŅĐŋŅ€ĐžĐąŅƒĐ˛Đ°Ņ‚и Ņ–ĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°Ņ‚и вĐĩĐģиĐēŅƒ ĐēŅ–ĐģŅŒĐēŅ–ŅŅ‚ŅŒ ĐēĐŊиĐŗ, Ņ‰Đž ĐŊĐĩ СавадиŅ‚ŅŒ ОйĐŧĐĩĐļиŅ‚и." -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "ВŅŅ‚Đ°ĐŊОвŅ–Ņ‚ŅŒ СĐŊĐ°Ņ‡ĐĩĐŊĐŊŅ 0, айи ĐŊĐĩ вŅŅ‚Đ°ĐŊОвĐģŅŽĐ˛Đ°Ņ‚и ĐļОдĐŊиŅ… ОйĐŧĐĩĐļĐĩĐŊŅŒ." -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "ВŅŅ‚Đ°ĐŊОвиŅ‚и ОйĐŧĐĩĐļĐĩĐŊĐŊŅ Ņ–ĐŧĐŋĐžŅ€Ņ‚Ņƒ Ņƒ" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "ĐēĐŊиĐŗ ĐēĐžĐļĐŊŅ–" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "Đ´ĐŊŅ–в." -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "ВŅŅ‚Đ°ĐŊОвиŅ‚и ĐģŅ–ĐŧŅ–Ņ‚" -#: bookwyrm/templates/settings/imports/imports.html:102 +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:125 +msgid "Book Imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 msgid "Completed" msgstr "ЗавĐĩŅ€ŅˆĐĩĐŊŅ–" -#: bookwyrm/templates/settings/imports/imports.html:116 +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 msgid "User" msgstr "КоŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡" -#: bookwyrm/templates/settings/imports/imports.html:125 +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 msgid "Date Updated" msgstr "ОŅŅ‚Đ°ĐŊĐŊŅ” ОĐŊОвĐģĐĩĐŊĐŊŅ" -#: bookwyrm/templates/settings/imports/imports.html:132 +#: bookwyrm/templates/settings/imports/imports.html:165 msgid "Pending items" msgstr "В ĐžŅ‡Ņ–ĐēŅƒĐ˛Đ°ĐŊĐŊŅ–" -#: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "ĐŖŅĐŋŅ–ŅˆĐŊĐž Ņ–ĐŧĐŋĐžŅ€Ņ‚ОваĐŊĐž" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "ВŅ–Đ´ĐŋОвŅ–Đ´ĐŊиŅ… Ņ–ĐŧĐŋĐžŅ€Ņ‚Ņ–в ĐŊĐĩ СĐŊаКдĐĩĐŊĐž." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -5768,7 +6026,7 @@ msgstr "ВŅŅ‚Đ°ĐŊОвиŅ‚и ŅŅ‚Đ°ĐŊĐ´Đ°Ņ€Ņ‚ĐŊŅƒ Ņ‚ĐĩĐŧŅƒ Ņ–ĐŊŅŅ‚Đ°ĐŊŅŅƒ" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "ОдĐŊĐ° С ваŅˆĐ¸Ņ… Ņ‚ĐĩĐŧ, СдаŅ”Ņ‚ŅŒŅŅ, ĐŋĐžŅˆĐēОдĐļĐĩĐŊĐ°. ВибŅ–Ņ€ Ņ†Ņ–Ņ”Ņ— Ņ‚ĐĩĐŧи СŅ€ĐžĐąĐ¸Ņ‚ŅŒ ĐŋŅ€ĐžĐŗŅ€Đ°ĐŧŅƒ ĐŊĐĩĐŋŅ€Đ¸Đ´Đ°Ņ‚ĐŊĐžŅŽ Đ´ĐģŅ виĐēĐžŅ€Đ¸ŅŅ‚Đ°ĐŊĐŊŅ." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" @@ -5822,15 +6080,15 @@ msgstr "ВидаĐģиŅ‚и Ņ‚ĐĩĐŧŅƒ" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "ĐĸĐĩŅŅ‚ŅƒĐ˛Đ°ĐŊĐŊŅ Ņ‚ĐĩĐŧи" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "ПоĐģĐ°ĐŧĐ°ĐŊĐ° Ņ‚ĐĩĐŧĐ°" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "ЗаваĐŊŅ‚Đ°ĐļĐĩĐŊĐž ŅƒŅĐŋŅ–ŅˆĐŊĐž" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5955,11 +6213,11 @@ msgstr "" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Ви ĐŋОвиĐŊĐŊŅ– ĐŊĐĩ видаĐģŅŅ‚и айО вŅ–Đ´ĐēĐģŅŽŅ‡Đ°Ņ‚и Ņ†ĐĩĐš ОйĐģŅ–ĐēОвиК СаĐŋиŅ, ĐžŅĐēŅ–ĐģŅŒĐēи вŅ–ĐŊ Ņ” ĐēŅ€Đ¸Ņ‚иŅ‡ĐŊиĐŧ Đ´ĐģŅ Ņ„ŅƒĐŊĐēŅ†Ņ–ĐžĐŊŅƒĐ˛Đ°ĐŊĐŊŅ ВаŅˆĐžĐŗĐž ŅĐĩŅ€Đ˛ĐĩŅ€Đ°. ĐĻĐĩĐš ĐŋĐĩŅ€ŅĐžĐŊĐ°Đļ ĐŋŅ–Đ´ĐŋиŅŅƒŅ” виŅ…Ņ–Đ´ĐŊŅ– GET СаĐŋиŅ‚и ĐŊĐ° ĐąĐĩСĐŋŅ€ĐžĐąĐģĐĩĐŧĐŊŅƒ вСаŅ”ĐŧОдŅ–ŅŽ С ĐąĐĩСĐŋĐĩŅ‡ĐŊиĐŧи ActivityPub ŅĐĩŅ€Đ˛ĐĩŅ€Đ°Đŧи." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "ĐĻĐĩĐš ОйĐģŅ–ĐēОвиК СаĐŋиŅ ĐŊĐĩ ĐŧĐžĐļĐŊĐ° СĐŊĐ°ĐšŅ‚и СвиŅ‡Đ°ĐšĐŊиĐŧи ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Đ°Đŧи Ņ– Ņƒ ĐŊŅŒĐžĐŗĐž ĐŊĐĩĐŧĐ°Ņ” ŅŅ‚ĐžŅ€Ņ–ĐŊĐēи ĐŋŅ€ĐžŅ„Ņ–ĐģŅŽ." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6094,17 +6352,15 @@ msgstr "ĐĄŅ‚вОŅ€Đ¸Ņ‚и ĐŋĐžĐģиŅ†ŅŽ" msgid "Edit Shelf" msgstr "Đ ĐĩĐ´Đ°ĐŗŅƒĐ˛Đ°Ņ‚и ĐŋĐžĐģиŅ†ŅŽ" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "ПŅ€ĐžŅ„Ņ–ĐģŅŒ ĐēĐžŅ€Đ¸ŅŅ‚ŅƒĐ˛Đ°Ņ‡Đ°" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "ĐŖŅŅ– ĐēĐŊиĐŗи" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "ІĐŧĐŋĐžŅ€Ņ‚ŅƒĐ˛Đ°Ņ‚и КĐŊиĐŗи" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index b365646885b2efc9452a0b57d440a887bf3bca74..1d1227f8092b70c68bb692fb532759090142aa83 100644 GIT binary patch literal 44096 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 S0TOg?KN0&d0;IH0jQ%f4%`RX7 literal 94511 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 diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 3f8bd34d5..c86fcef7a 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-30 23:52+0000\n" -"PO-Revision-Date: 2024-01-02 03:12\n" +"POT-Creation-Date: 2024-01-02 03:27+0000\n" +"PO-Revision-Date: 2024-03-17 12:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -54,19 +54,19 @@ msgstr "两æŦĄčž“å…Ĩįš„密į ä¸ä¸€č‡´" msgid "Incorrect Password" msgstr "密į é”™č¯¯" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "č¯ģ厌æ—Ĩ期不垗旊äēŽåŧ€å§‹æ—Ĩ期。" -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "阅č¯ģ厌成æ—Ĩ期不čƒŊæ—ŠäēŽåŧ€å§‹æ—Ĩ期。" -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "阅č¯ģ停æ­ĸįš„æ—Ĩ期不čƒŊ是将æĨįš„æ—Ĩ期" -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "č¯ģ厌æ—Ĩ期不čƒŊ是æœĒæĨæ—Ĩ期" @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "č‡Ē动į”Ÿæˆįš„丞æŠĨ" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "垅处į†" @@ -258,17 +259,24 @@ msgstr "å…ŗæŗ¨č€…" msgid "Private" msgstr "į§å¯†" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "æ´ģ衃" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "åˇ˛åŽŒæˆ" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "åˇ˛åœæ­ĸ" @@ -284,6 +292,10 @@ msgstr "加čŊŊäšĻįąæ—ļå‡ē错" msgid "Could not find a match for book" msgstr "扞不到匚配įš„äšĻ" +#: bookwyrm/models/job.py:22 +msgid "Failed" +msgstr "" + #: bookwyrm/models/link.py:51 msgid "Free" msgstr "å…č´š" @@ -309,11 +321,11 @@ msgstr "č¯„čŽē" #: bookwyrm/models/report.py:85 msgid "Resolved report" -msgstr "" +msgstr "åˇ˛č§Ŗå†ŗįš„æŠĨ告" #: bookwyrm/models/report.py:86 msgid "Re-opened report" -msgstr "" +msgstr "重新打åŧ€æŠĨ告" #: bookwyrm/models/report.py:87 msgid "Messaged reporter" @@ -325,31 +337,31 @@ msgstr "" #: bookwyrm/models/report.py:89 msgid "Suspended user" -msgstr "" +msgstr "停į”¨į”¨æˆˇ" #: bookwyrm/models/report.py:90 msgid "Un-suspended user" -msgstr "" +msgstr "取æļˆåœį”¨į”¨æˆˇ" #: bookwyrm/models/report.py:91 msgid "Changed user permission level" -msgstr "" +msgstr "更攚į”¨æˆˇæƒé™įē§åˆĢ" #: bookwyrm/models/report.py:92 msgid "Deleted user account" -msgstr "" +msgstr "åˇ˛åˆ é™¤į”¨æˆˇč´Ļæˆˇ" #: bookwyrm/models/report.py:93 msgid "Blocked domain" -msgstr "" +msgstr "åˇ˛åąč”Ŋįš„域名" #: bookwyrm/models/report.py:94 msgid "Approved domain" -msgstr "" +msgstr "åˇ˛æ‰šå‡†įš„域名" #: bookwyrm/models/report.py:95 msgid "Deleted item" -msgstr "" +msgstr "åˇ˛åˆ é™¤įš„饚į›Ž" #: bookwyrm/models/user.py:33 bookwyrm/templates/book/book.html:307 msgid "Reviews" @@ -359,7 +371,7 @@ msgstr "äšĻč¯„" msgid "Comments" msgstr "č¯„čŽē" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "åŧ•į”¨" @@ -401,7 +413,7 @@ msgstr "Deutschīŧˆåžˇč¯­īŧ‰" #: bookwyrm/settings.py:316 msgid "Esperanto (Esperanto)" -msgstr "" +msgstr "Esperanto (世į•Œč¯­)" #: bookwyrm/settings.py:317 msgid "EspaÃąol (Spanish)" @@ -409,7 +421,7 @@ msgstr "EspaÃąolīŧˆčĨŋį­į‰™č¯­īŧ‰" #: bookwyrm/settings.py:318 msgid "Euskara (Basque)" -msgstr "" +msgstr "Euskara (åˇ´æ–¯å…‹č¯­)" #: bookwyrm/settings.py:319 msgid "Galego (Galician)" @@ -433,7 +445,7 @@ msgstr "LietuviÅŗīŧˆįĢ‹é™ļåŽ›č¯­īŧ‰" #: bookwyrm/settings.py:324 msgid "Nederlands (Dutch)" -msgstr "" +msgstr "Nederlands (čˇå…°č¯­)" #: bookwyrm/settings.py:325 msgid "Norsk (Norwegian)" @@ -461,7 +473,7 @@ msgstr "Svenskaīŧˆį‘žå…¸č¯­īŧ‰" #: bookwyrm/settings.py:331 msgid "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (Ukrainian)" -msgstr "" +msgstr "ĐŖĐēŅ€Đ°Ņ—ĐŊŅŅŒĐēĐ° (äšŒå…‹å…°č¯­)" #: bookwyrm/settings.py:332 msgid "įŽ€äŊ“中文 (Simplified Chinese)" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文īŧˆįšäŊ“中文īŧ‰" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "å“Ļ不īŧ" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -482,11 +494,11 @@ msgstr "æ˛Ąæœ‰æƒé™" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "您无权æŸĨįœ‹æ­¤éĄĩéĸæˆ–æ‰§čĄŒæ­¤æ“äŊœã€‚您įš„å¸æˆˇæƒé™įē§åˆĢ是 %(level)s。" #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "č‹Ĩæ‚¨čŽ¤ä¸ē您åē”有权限īŧŒč¯ˇč”įŗģ您įš„ BookWyrm æœåŠĄå™¨įŽĄį†å‘˜ã€‚" #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -498,17 +510,18 @@ msgstr "äŊ č¯ˇæą‚įš„éĄĩéĸäŧŧ䚎åšļ不存在īŧ" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "文äģļå¤Ē大" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "您čĻä¸Šäŧ įš„æ–‡äģļå¤Ē大。" #: bookwyrm/templates/413.html:11 msgid "\n" " You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting.\n" " " -msgstr "" +msgstr "\n" +"您可äģĨå°č¯•äŊŋį”¨æ›´å°įš„æ–‡äģļīŧŒæˆ–č¯ĸ问 BookWyrm æœåŠĄå™¨įŽĄį†å‘˜åĸžåŠ  DATA_UPLOAD_MAX_MEMORY_SIZE įš„å€ŧ。 " #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -960,6 +973,7 @@ msgstr "äŋå­˜" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -977,6 +991,7 @@ msgstr "加čŊŊ数捎äŧščŋžæŽĨ到 %(source_name)s åšļæŖ€æŸĨčŋ™ #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "įĄŽčŽ¤" @@ -1100,11 +1115,11 @@ msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:12 #: bookwyrm/templates/book/book_identifiers.html:13 msgid "Copy ISBN" -msgstr "" +msgstr "复åˆļ ISBN" #: bookwyrm/templates/book/book_identifiers.html:16 msgid "Copied ISBN!" -msgstr "" +msgstr "åˇ˛å¤åˆļ ISBNīŧ" #: bookwyrm/templates/book/book_identifiers.html:23 #: bookwyrm/templates/book/edit/edit_book_form.html:352 @@ -1142,7 +1157,7 @@ msgstr "上äŧ å°éĸ:" #: bookwyrm/templates/book/cover_add_modal.html:23 #: bookwyrm/templates/book/edit/edit_book_form.html:250 msgid "Load cover from URL:" -msgstr "" +msgstr "äģŽ URL 加čŊŊ封éĸīŧš" #: bookwyrm/templates/book/cover_show_modal.html:6 msgid "Book cover preview" @@ -1171,7 +1186,7 @@ msgstr "æˇģ加äšĻį›Ž" #: bookwyrm/templates/book/edit/edit_book.html:43 msgid "Failed to save book, see errors below for more information." -msgstr "" +msgstr "äšĻäŋå­˜å¤ąč´ĨīŧŒč¯ˇæŸĨįœ‹ä¸‹éĸįš„é”™č¯¯äģĨčŽˇå–æ›´å¤šäŋĄæ¯ã€‚" #: bookwyrm/templates/book/edit/edit_book.html:70 msgid "Confirm Book Info" @@ -1474,9 +1489,12 @@ msgid "Domain" msgstr "域名" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1488,7 +1506,8 @@ msgstr "įŠļ态" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -2084,7 +2103,7 @@ msgstr "æŽ¨čįš„äšĻį›Ž" #: bookwyrm/templates/get_started/books.html:33 msgid "Search results" -msgstr "" +msgstr "搜į´ĸįģ“æžœ" #: bookwyrm/templates/get_started/books.html:46 #, python-format @@ -2166,7 +2185,7 @@ msgstr "äŊ įš„å¸åˇäŧšæ˜žį¤ē在į›ŽåŊ•ä¸­īŧŒåšļ且可čƒŊäŧšå—å…ļ厃 BookWyrm #: bookwyrm/templates/get_started/users.html:8 msgid "You can follow users on other BookWyrm instances and federated services like Mastodon." -msgstr "" +msgstr "您可äģĨå…ŗæŗ¨å…ļäģ–BookWyrmåŽžäž‹å’Œč”é‚ĻæœåŠĄįš„į”¨æˆˇīŧŒåĻ‚Mastodon。" #: bookwyrm/templates/get_started/users.html:11 msgid "Search for a user" @@ -2290,7 +2309,7 @@ msgstr "įŽĄį†å‘˜" #: bookwyrm/templates/groups/user_groups.html:35 msgid "No groups found." -msgstr "" +msgstr "æœĒ扞到äģģäŊ•įž¤įģ„。" #: bookwyrm/templates/guided_tour/book.html:10 msgid "This is home page of a book. Let's see what you can do while you're here!" @@ -2529,7 +2548,7 @@ msgstr "搜į´ĸæĄ†" #: bookwyrm/templates/guided_tour/home.html:79 msgid "Search book records by scanning an ISBN barcode using your device's camera - great when you're in the bookstore or library!" -msgstr "" +msgstr "äŊŋį”¨æ‚¨čŽžå¤‡įš„į›¸æœēæ‰Ģ描一ä¸Ē ISBN æĄåŊĸį æĨ搜į´ĸäšĻįąčŽ°åŊ• —— åŊ“您在äšĻåē—或回äšĻéĻ†æ—ļäŧšæ„Ÿč§‰åžˆæŖ’īŧ" #: bookwyrm/templates/guided_tour/home.html:80 msgid "Barcode reader" @@ -2545,7 +2564,7 @@ msgstr "å¯ŧčˆĒ栏" #: bookwyrm/templates/guided_tour/home.html:126 msgid "Books on your reading status shelves will be shown here." -msgstr "" +msgstr "您įš„阅č¯ģįŠļ态äŧšæ˜žį¤ē在čŋ™é‡Œįš„äšĻæžļ上。" #: bookwyrm/templates/guided_tour/home.html:151 msgid "Updates from people you are following will appear in your Home timeline.

    The Books tab shows activity from anyone, related to your books." @@ -2557,7 +2576,7 @@ msgstr "æ—ļ间įēŋ" #: bookwyrm/templates/guided_tour/home.html:176 msgid "The bell will light up when you have a new notification. When it does, click on it to find out what exciting thing has happened!" -msgstr "" +msgstr "åŊ“有新通įŸĨæ—ļīŧŒé“ƒäŧšäēŽčĩˇã€‚åŊ“厃发į”Ÿæ—ļīŧŒį‚šå‡ģ厃æĨ扞å‡ē发į”Ÿäē†äģ€äšˆäģ¤äēē兴åĨ‹įš„äē‹æƒ…īŧ" #: bookwyrm/templates/guided_tour/home.html:177 #: bookwyrm/templates/layout.html:77 bookwyrm/templates/layout.html:107 @@ -2671,7 +2690,7 @@ msgstr "手动æˇģåŠ čŽ°åŊ•" #: bookwyrm/templates/guided_tour/search.html:147 msgid "Import, manually add, or view an existing book to continue the tour." -msgstr "" +msgstr "å¯ŧå…ĨīŧŒæ‰‹åŠ¨æˇģ加或æŸĨįœ‹įŽ°æœ‰äšĻæœŦäģĨįģ§įģ­æ¸¸č§ˆã€‚" #: bookwyrm/templates/guided_tour/search.html:148 msgid "Continue the tour" @@ -2696,19 +2715,19 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_books.html:55 msgid "You can create additional custom shelves to organise your books. A book on a custom shelf can be on any number of other shelves simultaneously, including one of the default reading status shelves" -msgstr "" +msgstr "您可äģĨ创åģēéĸå¤–įš„č‡Ē厚䚉äšĻæžļæĨįģ„įģ‡æ‚¨įš„äšĻįąã€‚在č‡Ē厚䚉äšĻæžļ上įš„äšĻ可äģĨ同æ—ļ攞在å…ļäģ–äģģ意äšĻæžļ上īŧŒåŒ…æ‹Ŧå…ļ中一ä¸Ēéģ˜čŽ¤įŠļ态įš„äšĻæžļ上。" #: bookwyrm/templates/guided_tour/user_books.html:56 msgid "Adding custom shelves." -msgstr "" +msgstr "创åģēč‡Ē厚䚉äšĻæžļ" #: bookwyrm/templates/guided_tour/user_books.html:78 msgid "If you have an export file from another service like Goodreads or LibraryThing, you can import it here." -msgstr "" +msgstr "åĻ‚果您äģŽå…ļäģ–æœåŠĄå¯ŧå‡ē存æĄŖ文äģļīŧŒäž‹åĻ‚ Goodreads 或 LibraryThingīŧŒæ‚¨å¯äģĨ在čŋ™é‡Œå¯ŧå…Ĩ。" #: bookwyrm/templates/guided_tour/user_books.html:79 msgid "Import from another service" -msgstr "" +msgstr "äģŽå…ļäģ–æœåŠĄå¯ŧå…Ĩ" #: bookwyrm/templates/guided_tour/user_books.html:101 msgid "Now that we've explored book shelves, let's take a look at a related concept: book lists!" @@ -2766,7 +2785,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:10 msgid "This is your user profile. All your latest activities will be listed here. Other Bookwyrm users can see parts of this page too - what they can see depends on your privacy settings." -msgstr "" +msgstr "čŋ™æ˜¯æ‚¨įš„į”¨æˆˇčĩ„料。您įš„所有最新æ´ģ动éƒŊäŧščĸĢ列在čŋ™é‡Œã€‚å…ļäģ– Bookwyrm 厞䞋į”¨æˆˇäšŸå¯äģĨįœ‹åˆ°æ­¤éĄĩéĸįš„部分内厚 —— äģ–äģŦčƒŊįœ‹åˆ°äģ€äšˆå–å†ŗäēŽæ‚¨įš„隐į§čŽžįŊŽã€‚" #: bookwyrm/templates/guided_tour/user_profile.html:11 #: bookwyrm/templates/user/layout.html:20 bookwyrm/templates/user/user.html:14 @@ -2813,113 +2832,123 @@ msgstr "" #: bookwyrm/templates/hashtag.html:25 msgid "No activities for this hashtag yet!" -msgstr "" +msgstr "此标į­žå°šæ— æ´ģ动īŧ" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "å¯ŧå…ĨäšĻį›Ž" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "å¯ŧå…ĨäšĻ单" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" -msgstr "" +msgstr "无效įš„ CSV 文äģļ" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "数捎æĨæē:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" -msgstr "" +msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" -msgstr "" +msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" -msgstr "" +msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" -msgstr "" +msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" -msgstr "" +msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." -msgstr "" +msgstr "您可äģĨäģŽæ‚¨įš„Goodreadså¸æˆˇįš„ å¯ŧå…Ĩ/å¯ŧå‡ēéĄĩéĸ 下čŊŊ您įš„Goodreads数捎。" -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "数捎文äģļ:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "įēŗå…ĨäšĻč¯„" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "å¯ŧå…ĨäšĻč¯„įš„隐į§čŽžåŽš" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "å¯ŧå…Ĩ" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." -msgstr "" +msgstr "æ‚¨åˇ˛čžžåˆ°å¯ŧå…Ĩ限éĸã€‚" -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "最čŋ‘įš„å¯ŧå…Ĩ" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" -msgstr "" +msgstr "创åģēæ—Ĩ期" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" -msgstr "" +msgstr "最后更新" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "无最čŋ‘įš„å¯ŧå…Ĩ" @@ -2955,9 +2984,10 @@ msgid "Refresh" msgstr "åˆˇæ–°" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" -msgstr "" +msgstr "停æ­ĸå¯ŧå…Ĩ" #: bookwyrm/templates/import/import_status.html:78 #, python-format @@ -3051,6 +3081,133 @@ msgstr "æ­¤å¯ŧå…Ĩ所į”¨æ ŧåŧåˇ˛ä¸å†å—支持。 åĻ‚果您æƒŗčĻåœ¨æ­¤æŦĄå¯ŧ msgid "Update import" msgstr "更新å¯ŧå…Ĩ" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "å¯ŧå…Ĩ BookWyrm å¸æˆˇ" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "无效įš„å¯ŧå…Ĩ文äģļ" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "æ­ĨéĒ¤1:" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "æ­ĨéĒ¤2:" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "į”¨æˆˇä¸Ēäēēčĩ„æ–™" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "į”¨æˆˇčŽžįŊŽ" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "您įš„æ—ļåŒē" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "éģ˜čŽ¤å¸–文隐į§čŽžåŽš" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "å…ŗæŗ¨č€…å’Œæ­Ŗ在å…ŗæŗ¨" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "阅č¯ģį›Žæ ‡" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "äšĻæžļ" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "阅č¯ģ莰åŊ•" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "äšĻč¯„" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "äšĻį›Ž" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3071,7 +3228,7 @@ msgid "Reject" msgstr "éŠŗ回" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "å¤ąč´Ĩ饚į›Ž" @@ -3239,7 +3396,7 @@ msgstr "密į " #: bookwyrm/templates/layout.html:136 msgid "Show/Hide password" -msgstr "" +msgstr "昞į¤ē/éšč—å¯†į " #: bookwyrm/templates/layout.html:150 msgid "Join" @@ -3520,7 +3677,7 @@ msgstr "" #: bookwyrm/templates/moved.html:42 msgid "Undo move" -msgstr "" +msgstr "撤销į§ģ动" #: bookwyrm/templates/moved.html:46 bookwyrm/templates/user_menu.html:77 msgid "Log out" @@ -3846,6 +4003,16 @@ msgstr "更攚äē† %(group_name)s įš„名į§°" msgid "has changed the description of %(group_name)s" msgstr "更攚äē† %(group_name)s įš„描čŋ°" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "删除通įŸĨ" @@ -3980,7 +4147,7 @@ msgstr "您æ­Ŗ在å…ŗæŗ¨ %(display_name)sīŧ" #: bookwyrm/templates/preferences/2fa.html:7 #: bookwyrm/templates/preferences/layout.html:24 msgid "Two Factor Authentication" -msgstr "" +msgstr "双重éĒŒč¯" #: bookwyrm/templates/preferences/2fa.html:16 msgid "Successfully updated 2FA settings" @@ -4010,11 +4177,11 @@ msgstr "" #: bookwyrm/templates/preferences/2fa.html:40 msgid "Generate backup codes" -msgstr "" +msgstr "į”Ÿæˆå¤‡äģŊäģŖį " #: bookwyrm/templates/preferences/2fa.html:45 msgid "Scan the QR code with your authentication app and then enter the code from your app below to confirm your app is set up." -msgstr "" +msgstr "äŊŋį”¨čēĢäģŊéĒŒč¯åē”į”¨æ‰Ģ描äēŒįģ´į īŧŒį„ļåŽčž“å…ĨäģŖį äģĨįĄŽäŋæ‚¨åˇ˛čŽžįŊŽã€‚" #: bookwyrm/templates/preferences/2fa.html:52 msgid "Use setup key" @@ -4050,24 +4217,24 @@ msgstr "莞įŊŽåŒé‡čēĢäģŊéĒŒč¯" #: bookwyrm/templates/preferences/move_user.html:7 #: bookwyrm/templates/preferences/move_user.html:39 msgid "Move Account" -msgstr "" +msgstr "į§ģåŠ¨å¸æˆˇ" #: bookwyrm/templates/preferences/alias_user.html:7 #: bookwyrm/templates/preferences/alias_user.html:34 msgid "Create Alias" -msgstr "" +msgstr "创åģēåˆĢ名" #: bookwyrm/templates/preferences/alias_user.html:12 msgid "Add another account as an alias" -msgstr "" +msgstr "æˇģ加åĻ一ä¸Ēå¸æˆˇäŊœä¸ēåˆĢ名" #: bookwyrm/templates/preferences/alias_user.html:16 msgid "Marking another account as an alias is required if you want to move that account to this one." -msgstr "" +msgstr "åĻ‚果您æƒŗčĻå°†åĻ一ä¸Ēå¸æˆˇį§ģåŠ¨åˆ°æ­¤å¸æˆˇīŧŒåˆ™éœ€čĻå°†å…ļæ ‡čŽ°ä¸ēåˆĢ名。" #: bookwyrm/templates/preferences/alias_user.html:19 msgid "This is a reversable action and will not change the functionality of this account." -msgstr "" +msgstr "čŋ™æ˜¯ä¸€ä¸Ē可逆įš„操äŊœīŧŒä¸äŧšæ”šå˜æ­¤å¸æˆˇįš„功čƒŊ。" #: bookwyrm/templates/preferences/alias_user.html:25 msgid "Enter the username for the account you want to add as an alias e.g. user@example.com :" @@ -4076,20 +4243,20 @@ msgstr "" #: bookwyrm/templates/preferences/alias_user.html:30 #: bookwyrm/templates/preferences/move_user.html:35 msgid "Confirm your password:" -msgstr "" +msgstr "įĄŽčŽ¤å¯†į " #: bookwyrm/templates/preferences/alias_user.html:39 #: bookwyrm/templates/preferences/layout.html:28 msgid "Aliases" -msgstr "" +msgstr "åˆĢ名" #: bookwyrm/templates/preferences/alias_user.html:49 msgid "Remove alias" -msgstr "" +msgstr "į§ģ除åˆĢ名" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "åąč”Ŋįš„į”¨æˆˇ" @@ -4222,16 +4389,68 @@ msgstr "éģ˜čŽ¤å‘文隐į§:" #: bookwyrm/templates/preferences/edit_user.html:136 #, python-format msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" +msgstr "æ­Ŗ在å¯ģ扞äŋæŠ¤äšĻæžļ隐į§įš„æ–šæŗ•å—īŧŸæ‚¨å¯äģĨä¸ē每ä¸ĒäšĻæžļ莞įŊŽä¸€ä¸Ē单į‹Ŧįš„å¯č§åēĻ。čŊŦ到 您įš„äšĻæžļ īŧŒäģŽæ ‡į­žæ ä¸­é€‰æ‹Šä¸€ä¸ĒäšĻæžļīŧŒį„ļ后单å‡ģ“įŧ–čž‘äšĻæžļ”。" + +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "å¯ŧå‡ē BookWyrm å¸æˆˇ" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "您可äģĨ在此创åģē一ä¸Ēå¯ŧå‡ē文äģļ。čŋ™å°†å…čŽ¸æ‚¨čŋį§ģ您įš„数捎到åĻ一ä¸Ē BookWyrm å¸æˆˇã€‚" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " msgstr "" +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "在您新įš„ BookWyrm å¸æˆˇä¸­å¯äģĨ选拊å¯ŧå…Ĩäģ€äšˆīŧšæ‚¨æ— éœ€å¯ŧå…Ĩ所有å¯ŧå‡ēįš„内厚。" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "最čŋ‘å¯ŧå‡ē" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "æ—Ĩ期" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "大小" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "下čŊŊ您å¯ŧå‡ēįš„æ–‡äģļ" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" -msgstr "CSVå¯ŧå‡ē" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "å¯ŧå‡ēäšĻ单" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." -msgstr "äŊ įš„å¯ŧå‡ē将包æ‹ŦäŊ äšĻæžļ上įš„所有äšĻįąīŧŒäŊ č¯„čŽēčŋ‡įš„äšĻįąīŧŒäģĨ及有阅č¯ģæ´ģ动įš„äšĻįąã€‚" +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4243,27 +4462,23 @@ msgstr "å¸åˇ" #: bookwyrm/templates/preferences/layout.html:32 msgid "Move Account" -msgstr "" +msgstr "į§ģåŠ¨å¸æˆˇ" #: bookwyrm/templates/preferences/layout.html:39 msgid "Data" msgstr "数捎" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "CSV å¯ŧå‡ē" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "å…ŗįŗģ" #: bookwyrm/templates/preferences/move_user.html:12 msgid "Migrate account to another server" -msgstr "" +msgstr "čŋį§ģå¸æˆˇåˆ°åĻ一ä¸ĒæœåŠĄå™¨" #: bookwyrm/templates/preferences/move_user.html:16 msgid "Moving your account will notify all your followers and direct them to follow the new account." -msgstr "" +msgstr "į§ģ动您įš„å¸æˆˇå°†äŧšé€šįŸĨ您所有įš„å…ŗæŗ¨č€…åšļ指į¤ēäģ–äģŦå…ŗæŗ¨æ–°å¸æˆˇã€‚" #: bookwyrm/templates/preferences/move_user.html:19 #, python-format @@ -4474,7 +4689,7 @@ msgstr "æ˛Ąæœ‰æ‰žåˆ° “%(query)s” įš„搜į´ĸįģ“æžœ" #, python-format msgid "%(result_count)s result found" msgid_plural "%(result_count)s results found" -msgstr[0] "" +msgstr[0] "扞到 %(result_count)s æĄæœį´ĸįģ“æžœ" #: bookwyrm/templates/settings/announcements/announcement.html:5 #: bookwyrm/templates/settings/announcements/announcement.html:8 @@ -4687,11 +4902,11 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:32 msgid "Broadcast" -msgstr "" +msgstr "åšŋ播" #: bookwyrm/templates/settings/celery.html:38 msgid "Inbox" -msgstr "" +msgstr "æ”ļäģļįŽą" #: bookwyrm/templates/settings/celery.html:51 msgid "Import triggered" @@ -4741,7 +4956,8 @@ msgid "Active Tasks" msgstr "åŊ“前äģģåŠĄ" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "ID" @@ -5131,9 +5347,14 @@ msgid "No instances found" msgstr "æœĒ扞到厞䞋" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "停æ­ĸå¯ŧå…ĨīŧŸ" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "" @@ -5146,68 +5367,105 @@ msgstr "" msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:36 -msgid "Disable imports" +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:37 +msgid "Disable imports" +msgstr "įĻį”¨å¯ŧå…Ĩ功čƒŊ" + +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" -msgstr "" +msgstr "启į”¨å¯ŧå…Ĩ功čƒŊ" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "莞įŊŽå¯ŧå…Ĩ限åˆļä¸ē" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "æœŦäšĻįąæ¯" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "夊。" -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:102 -msgid "Completed" -msgstr "åˇ˛åŽŒæˆ" +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" +msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:116 -msgid "User" -msgstr "į”¨æˆˇ" +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "小æ—ļ" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" +msgstr "" #: bookwyrm/templates/settings/imports/imports.html:125 -msgid "Date Updated" -msgstr "æ—ĨæœŸåˇ˛æ›´æ–°" - -#: bookwyrm/templates/settings/imports/imports.html:132 -msgid "Pending items" +msgid "Book Imports" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 +msgid "Completed" +msgstr "åˇ˛åŽŒæˆ" + +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 +msgid "User" +msgstr "į”¨æˆˇ" + +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 +msgid "Date Updated" +msgstr "æ—ĨæœŸåˇ˛æ›´æ–°" + +#: bookwyrm/templates/settings/imports/imports.html:165 +msgid "Pending items" +msgstr "垅处į†įš„饚į›Ž" + +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" +msgstr "成功įš„饚į›Ž" + +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 +msgid "No matching imports found." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:170 -msgid "No matching imports found." +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" msgstr "" #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 @@ -5464,7 +5722,7 @@ msgstr "å…čŽ¸æŗ¨å†Œ" #: bookwyrm/templates/settings/registration.html:43 msgid "Default access level:" -msgstr "" +msgstr "éģ˜čŽ¤æƒé™į­‰įē§īŧš" #: bookwyrm/templates/settings/registration.html:61 msgid "Require users to confirm email address" @@ -5750,7 +6008,7 @@ msgstr "删除ä¸ģéĸ˜" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "æĩ‹č¯•ä¸ģéĸ˜" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" @@ -5758,7 +6016,7 @@ msgstr "" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "加čŊŊ成功" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -5781,7 +6039,7 @@ msgstr "į”¨æˆˇ: %(instance_name)s" #: bookwyrm/templates/settings/users/user_admin.html:29 msgid "Deleted users" -msgstr "" +msgstr "åˇ˛åˆ é™¤å¸æˆˇ" #: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 @@ -5891,7 +6149,7 @@ msgstr "" #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" -msgstr "" +msgstr "æŋ€æ´ģį”¨æˆˇ" #: bookwyrm/templates/settings/users/user_moderation_actions.html:41 msgid "Suspend user" @@ -6022,17 +6280,15 @@ msgstr "创åģēäšĻæžļ" msgid "Edit Shelf" msgstr "įŧ–čž‘äšĻæžļ" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "į”¨æˆˇä¸Ēäēēčĩ„æ–™" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "所有äšĻį›Ž" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "å¯ŧå…ĨäšĻį›Ž" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6178,7 +6434,7 @@ msgstr "č¯„čŽē:" #: bookwyrm/templates/snippets/create_status/post_options_block.html:19 msgid "Update" -msgstr "" +msgstr "更新" #: bookwyrm/templates/snippets/create_status/post_options_block.html:21 msgid "Post" @@ -6283,7 +6539,7 @@ msgstr "在 GitHub." -msgstr "" +msgstr "BookWyrmįš„æēäģŖį æ˜¯å…č´šå¯į”¨įš„。您可äģĨ在 GitHub 上贡įŒŽæˆ–æŠĨå‘Šé—Žéĸ˜ã€‚" #: bookwyrm/templates/snippets/form_rate_stars.html:20 #: bookwyrm/templates/snippets/stars.html:23 @@ -6443,7 +6699,7 @@ msgstr "" #: bookwyrm/templates/snippets/shelf_selector.html:53 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21 msgid "Stopped reading" -msgstr "" +msgstr "停æ­ĸ阅č¯ģ" #: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 #, python-format @@ -6516,7 +6772,7 @@ msgstr "更多äšĻæžļ" #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:31 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48 msgid "Stop reading" -msgstr "" +msgstr "停æ­ĸ阅č¯ģ" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:40 msgid "Finish reading" @@ -6685,7 +6941,7 @@ msgstr "昞į¤ē更少" #: bookwyrm/templates/snippets/user_active_tag.html:5 msgid "Moved" -msgstr "" +msgstr "åˇ˛į§ģ动" #: bookwyrm/templates/snippets/user_active_tag.html:12 msgid "Deleted" diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo index e9e223f74ebeacd4c6d2ef24a7a0324cf2e268a7..f9ca27be9b891b3b13c30e68d084e0cd54184a43 100644 GIT binary patch literal 38839 zcmchg34D~*x&L4Hiu+oZssoCE5hUF_oRYHRJjnwd;md#&19+uPRv_jk_oP9^~q@9pP5A5XsLIp@4*KhJs2 zd1vs~Cm+5j;B&{JLGUT~+Q~uC?XV!2-C3bQ(5rV4Tm&zHr@?z*2bh9q!!NU*kAuD7QLwMY4>Wm*$+ww&57cwz zkYNa_;IZ(23x5b6jXWKyUl*9X(zpRC{R{AT_*Hled=*{-e+5;)6H0^NM0h$>JGwwU zR|551DO5cMLDl0{sB&+ID);kH>8qjg{Ss7vZ?^E?L$&)YsQmr~mCvz#{P>*+mA*Gr zx)@adq@l`r5UQS2;mL3|)VME)O7|7xEAVjSSK(>!b*Os13D1CkhpO+%SNU=}L8b2n z)i0MpwZ9)!zBfSCXBbqyKL?e*5~{!MhnoMB;azYJRJvw3AHD~b-}I}4;3UOE$;+YY zwc6xuQ0?0RRlmJZ<$fP3-LIgY`vX+EKSQPa8&o}x>g(%!2Glr3p!%&FRDCYB`2JA! zxXE}ARDUKceiBqUGoZ?u2Q{DTq3W|9s-Jd1)$3)b{9d*2H!S=usOSC(8S3D~Yl5H$ zycwPcCqnh_6Hw1T4b_j&L*={I^SLg|B1Q1f9TJR3d+RsLqE^bJt;`zBO>d>^X6e+;jHS*ZR!x1VQMsPw&|(v?D$ zca!l>3m*+Nf5t)0&j+FEy8x;^&p?&G87luq<2Q^yu=t-t)wkK?cc9Asz`{@Hk1j(# z3#z`CLA4_R)qfeNc{2rSzAS_)?8&J=;Kt2BsbmMM3 zae!~{1@JuLyFs;Y5Y+s-9Y)~ipvrj&D!(~U^{a>Kr?pV&cSE)FWvG68&EynkL4zBfa-_c@J#q! zsPdbQf42C)L$&+pfj+v|j{2Lw)Pr1S8a|TqsE`)l%C;TkD1}gt2q56F_RQt9-rE7#k;dh|s&DnIK>d^

    X;zjxq~@Za!Uc*G#z z?hByu=?;~yx5<5>^1BXVG6Z))jpG8S`YwagGh5&%;CGBaHvSq)4>v>Q^AGqbc*0FS zpYFyh;n9Q-gsR7IsP^3s)gR?h<;9`$dl0H0=0dgODOdsk)N?zb#_y|8`Mm;F-jAT#`#Y$4@Gexk zqlWnWj)%&>3p^HfH(m*QBM*dX*955g&V?$k9;%<0L)GUw*ctADO4nq36Ds{*pz852 zsQR5S)Ys!osBw$H3*eW1x>KR_Oh>5nec%aj5LEehK{qd;>Q!Um55n`2CtLg) z*b{jdRQvx3Rlk2h)&Gd$e&0GCc0=w4rJqJX^-~Gw?ox429-}0JPb~RRq!FG`oC%XD^&V_!xQ0=Bm8rpgzAqAj6I;rxdJNv zy-?#c8min3RK8Q7o|_H3z21#czPB&vuJ%gsRuqEd0Ard)R#`CbEMkKYJYucx859laZ^T^!5~p2^6fb_&1>X>wT#8aoC-{Uyg=q*NIT`cBp*54ljh?gR0kG zq3VC=-ChrMfXeRzsQgNy>U$$pyKjXo^id5TRJv-|6@JOW*Fe>8Gh|5yyNoA}^7kh(cm?4*p~m+esCFGu z=Iw`5pz8f;sBtcZs{a5BzZt5Xx0rkmJIeZP!=YDXPB8`eY3>upf!z5+i5 z--bLI96!eQTLzww{1iN0=}i8q#s3p(oI6)|_JPXh7I*=XC$W~gyE z{|iCz0DJ&m1K);f?i4N8KM9rZI(Q}gCDik$Cp^!A%KrkBdqDN$ zWw1Z|JXHOjvH0!A2IE(t>h&$y5&q1={|BmmhbDbF9iZBK5>!1efNmU3z6qW{_#IHs zje*C(BvgIB1Xa&Rpz@guPk}2f{snjfa-+%Lfm&BTf=b_`nmk}XsQmUq_0u;@{v}ks z-he9q&ldi^g?|8*|FQS`bf1FCryEqgdRcfWRK0Jo_}ifJyT{~msB*@d`~Xz_9)^1E zQK)*Yu=p2^yNxeHJ^yXvPmNjQJH`);$EJMxGojY^h43@5KkNY~LapOxq1y9Z<7-g$ z`Gv8?_&2EXk6_U%{$waQVseSeeW3EY5vo1IEIejR86Sq42eaY1a5Yr=m!Y2jIaL4s z&g2%8|7`O6Q0@4@i<%xb$B~ex$~j&UksIQwQ-w;?}bYDU8s7$X7Rs- zCnL8&>5G5D!{AZl{QhtZ)N`jo<$JcVtA$?%wO+5X@Ov$MEQ}DIvhc@@E1>58CaC)E zhRXlj7XL$d3i5A^??SDMqsII4PcoisycnwfS3tGvW~lr|Soqyg^{#>{Zz4P%*1=A2 zvBft))$5y3&;P{aU&Buz|F`jPQ2T*46X~@hq0$e6nt#JhjvK3?>Ng&$9y5)LEqs;9 zFG1DsW#bPm{Fo8bVc{O1`LL#0~|PlOxc9dI}73{QK| z$M=CJA>Rm9kGm~AYI4Hl8mM+nHqN*BWl;584Nr#+@ND=hRDOSgs`p<^KKzS*-W~%L zUt;_;RQ`RS+A#>~xm(}>7&Un{)VRI?Ro=Hu{tZ-q??8>)-=UsAj7{SVcnXw$>JHT} zHyiIX#-PegL9NG$Q29-TDsQ%Nxp5oRJpMZD3iD9;p7fAUe=d}KiOGG9w^(>N)N}Vk z)$a+YeS15Uef4XoaXRc_-=1#pEaXc~9tu^zJE7`*pUGn^K4J0$CO>TQ40tK&=Ue#8 z7XCe`ar-e;zr77LZw{&T?Kl~#ob!xbp!%gJR6F|{he6fr9;o`3nfwq`x~cFq_$X98 z)$^KV%AA1(Yna29>@V zs$Szwo&}ZeQInsx_-9StZG0JOzyG$yzXi2_9yZ0-r#Dpo*F&{qFgz2Eglc~Rs-BCX z*2yZ9pEK@)nt$K2_&*u{X7PtS;`2Wq-blLBV0U;gRC%*3{xRbdQ0-i4@(WPqH$t`d z6_bBv%t6)vU6cP|JZh@1@2RjO@#jMI^R-ar4u#6^cBtn^!&_k$RC!;v@b8-Z8r1y# z9n^DwvGBvE`Sd42_1C#j`Q2dQL!r`t*22d^m7jvD*F@L_E`=)hW#g;HUmO1jmCySy z0zWa`r|$;UuFFln&Ugz{`g`G#FacHn8h8|}v+()G#ZdEl8PqsG3-$bVQ_6h(8^were+*sC?%^)n_?We%qk(-wU;$eFJuZe}gx|^JaKf zz!K!G@OtXkZZ!GF#;ozLQ2OTF6 zxY76%sD3$gzVD~A;rYlH!<*nRsC=J*YR7x97d&o(uTNj&&Bi<7SmI;wPWY;YU-YO? z{~6DIzS;0*qx;jM@AhmX=~ob)-I zxM!4z&v*~_cLiY@V}>Yr7XMV-5%&Cvu!iur3G0i~NBuP(|9S9n_-ClKQDV>FbsxFqW_T{E)vZaKkMh1vXoH z`9~0b9Wv_DeTG|Ht;t=8Kf%II#XrIP1Bw3zZVU2-miK7n0mw^mvvC6n|0Q9k<4!@= zKKNPqFBrwWieGz{KKJ6k6!wE1EWay|uf+cWOc5S_{($G#xZ0wyi}Alp*w>1}eu;k& zVL!&{leM_V@E=LOFCmY_p~~IoZ~UExJly2-@V|xoH}Vb(dly-sN$}UW({LkjN2|`b zlktb2(~JBO0+SX|M|ee1-18RxB4MStOL4~$c2`lFW6Xa&WgLt90&+8HzHHBa)hJwm zI}*1Ox0`gIBK`ev2(muIaNR6F$=h&O%fsg)!hdCP!{8>uj)&`D7hE^o>&RD-=PvjZ zZX>P?cQaunuoK)vx-(!5cE!Cw_+Mf8`7ZLZP=G6udy@V-+>QA4SqvY*y@&sD+%5Re zAwK-vji(&frzlKuOYQl;ugAp9EKCR`_6FT(x@o(>;^U&3|8ej}REr_XYu{MX`NgZo}l*tZCO4f*HrC%6t4_eppXvOb@otY08k z;qQ$5EpDx)!y8_+THA3=S-5AX5b;3WKC!5@KTuou)P!gJ;Lf9J*E26zeXe{eStcQ|e^ z?)%6;!u<@_Ncu-`Q*dK&AK)&>y+Yi4*co>#{=?vnJgd+3_S3$ra^66-0oCKqU zf6fwafpd}j!P|-JZQ)lE_D@{+860}xtL9%s{98rgP3He^m^c4*#!;lbh5V1f9fxzD z&RxrrHHl0t)h!(vovf@(j*q2+{RO7?6Brb#zQDO|Fi_ zRYntIYAh`D6I@l3sfku9VOV@*LbAq${l=&Fo8Z3kc)GeWI^m--+E2Q68787tF>sHkeM_rjsj^st9_idUQkJZ$u8d`3 z9Z8ppX2^rA)0wC`xs9yuOIJiwvGV&yC6i;-Az~z%P;*m}bVaOk9IqAkn<~AZWHsqn zspVZC>bPiPLPXJR%kGjUKi`p&{%UobOo(;a6F4qfS))OTr)h`=gn)QC z!%~&Z#O{liA2>-^CsJ5Jx7t|VKs)vg9iB>#NyXCXpsU(GE*=|SXsZ{y9WW+M)Q#~B zwW>_gotb2$rn)@J*mn!|>Dr#L@^~hmOt?M{yEhC|e-=MNhGbKIUpOkMSaoGQR<2|! z#m$d4C8U^sh15*JDr8NOt726QsXFz(OgvLbk6zW2p#N-n_t!8ck3N)P;_NHF;=6`WJN`}IZz!o6^&O$qUGgo zdMkqrQy?;m85&=(iYG=V6;KtYefsOW)q*I+ z4{6Y^G9FFG)TYWxxvE6Q;}+Q-!wFzV4E#0&L}4{B3%^FeS@lQT3nn8Dq@j zANfQoR#N;(B7wnD7L!T~`V|S3pUA{Z1|(BVRI*28h!PW$iCCm8n$X1ejnIN{b@QFt znj&2@hGt}Zs_v0=&8RQL%39Y?w7NQ#WZ&V-Rn?UfBBSG#m`#-Gf+;S|rY|EQ@bkeC z8B|V9}x%)O^EVnN)%L%knTrZgV?#C@}+Tm>F)S>ra~|x`2_|TwH=X zCZwt&70EQi?KYq&#?OSx*wvlNl9kC+Y2^G%dw=HA^0Gdi%=D+{6^k)e(Q&B0=%~tAkH}pZmzoY`$wVd< zA63Ivg*oSYhbPkXnpM=>LSco*ps{L3^p6;|$J546eQ$_oZmb!l z>h*9fr>luW*-wac?rJKD5Z1B#D3`i!*YsxYOnMO(`e{TbX^Z_*qX)&Uz$ttW5S&WXSst9(B zs1cDtXpKThsOptTBE!;*Xn0s((kTkk${gS{+W<5fE72oTyjsJsK?zi8A;n;+IZHi4 zJ6|X;V4-rhXgBN4@Akwnsox1xN!DkWZ#m{?d8DjHYN5RX4fnTV>($LMpZCX0?krum zgGSv-FKr$A0lxGA$}V71njIQk$4b{2v-+IZPhls-B2I%VoDOz-7pu}sQtjSrYh5DU z9j@f-VmgGRu#+dc7@a~$AVe-?!k3h%qI@mTLa?gQQDtsFPltiNUoC~rSCcXom>tC% z)d9k<3G;Fq7X|8!Ycq_AD=5vPO_HX^GAvl?ft8CCPe~6C3HOmR75Zo&1~^6pQB zqthrBOlVzq@}X@ez7m_sV6lFxctOj}``q!wC3dUA`8b@oY3&5RK%AF;Z4EE79$cg! zMR|4J@MpN(c8eM%W6E1; zVTcyF`I(pQf(SilAA8>a}zsK)SLJt%T#GGSQHc zLDxA^c0yrZ`}ssEX{k+bA$4M>_9sBMl{(FMjZ(PnLvdb>NsASyly15vxG7nYh@hOi zM{bH@^^d5+W+M=@M1NZMVkZqvj(5Qvb-B-}cp*7lS9(V2<)!Db8sGa1yD{cejZPKFb_LIgH$AaamlRXaQH8?&h z6-`Z`-?_bW3wm&TY>eQs1ygY_HxLBSf?+9?u=hGEi`|3_6@zK%_8ljs{a;x{GTi-; z2ZME4=5)M2H`b&$in~Boa!qB%j+0603rzP+v@$scE1e`|9LC&VJBom6ashMI*-^{RM8gVPm!&6w5rDgYF9cK!Yb1Kj3*OirbdGy{_cf# znPE?y=1I}O$|m=LI`S9C__GfA>xrbhmaxZVDd>)Q2pg_D1qWU;Nc*>1{X=69WP+h& z>833`Eek$f2w}LfjwZx19Tg-)Ls$DXiSl-$yGCc>v&*HpweQqEnw_Z3O+KwPmq==& zIJLJ6CUvc(zFgEb_{UagDyj;h>vq=_fvExGSK?5^#;5wJG+K?hjq98Lu_Ov>A^bg`!n#rPnBKFDRCsa&a1jvvM$8 zyKO1(SDEZoNON$hj9?t|=0&qF7+x7I6Oz?6l^mc+ z-1cg4xQ^la6Iw4`pjo4394f|JR|UoEHC92(7Ar7k3J-VoE^lv~;WCj+r_xA3pk5$& za%q6a*-DY&$;x;cZEYjcRFk>Tl@4}Oz;7SqYdgE8VsX=6XY@n=#v=4YZga04)Qc8{ zPqt>6hch_~d!CDF6XdTfLhIDMaPq$kI4CY zd!ztfPIXJS+wm;TwZ*f@9^7Zz9q=&gGa-GbkSqt)T?I4zp@-QYHYB_pFGOAC_CDSU zwM%hTPai=h?i?a>%UNu$lfqCI%dPJHL%3c|40j6?-NxBw2^RJfrAV^tgj9x^)P#sL zrtrH3TERvykg#mK#P;%8Op_1tXyJn)#6%d{=olvP)yv`>B+xz?( z!@mR4{$=k2SYmEproo&ZQLd04Yb|wboI``&>#=JPnH-%NA61^_;W-Yp-jE(ITV#AH znHbYCG9sB`o`)t|G((FN(lIhpdHGRdcKD0zgsw)o8&3H*-!5$?(tm=U$wXvoJ0Eq8 z7OvD3MSu=(eh&>s_|srI60M;7I|d_k)clYO4IeMHZb`j{_rW%TJ_beLLMg8(To>E~ z1AU!>HoS9Rdx@Djk_Du1tT+qL(rK1(r|G}%664if z(jUS*Dz(lPIA)+<$1WrlA5)PbY&_GIS?pg*gf@%UTgrtF(f*`)*qW7!ky>#3vp+7h z%Wky02~&1axAyjv6}Qi-Ra$pNys*HO)9Q1ksR~7Zgaxa~EU5720PlX@ySHw$It1HSlynIEgF=4Fe^B<1#JR4f{*=p}ud{gGE$_JW-^ z%TAm6z04ZpDyafowghrpmR48M&F$+@Y^sXzgf?n6kcxP34GKQSNg50F;vRNtTq`uA#ieX)lXjbUoLd|F7GXD5M>?G>i?fTA7bZryHTQ5C zh6hcrV8&OlO%xU|vs%TpX+-N&++UQ)EKrkBDH+y*wr-wIwceVwexJ>{7=7hUh92(l zrZ%YxgzB!S%)f8XO9-6Jx910Y`*K>ceZ(L7qyJgQcE{Z(y;Za0LL zgAmEW-+j>I^Q)z>Y(GkXgx%F|rD@iA& zn9^;&`sl)nFC0>p`u2mjY&4ND2JKye8wF`g|9vI*WPf)*;=F_D{IoisdrvcG-DZ=P z8C+AX1)^zCR93kC`SSwrMOB`+$E$b=$}WWg;l4wlv1Zcj|F-iZi!9{-zs%cfUssH; zPS{TOr9*3T`^DvZ!tbByz-|SUQ^63>cB+d{m;L@j73X$1<31{;{g*VYe&lw5_k~V3 z9Bgg}`K8K(&CYj*PQw3*%3hQ-|R+of+^D5TupWgDp_z=oTE-n77Y_|~p6ikWB=QeQ8?3h{YqiAIYT=z(X~ zhmPRK%k&_J;NxX_aKrHN@+=w(rf~aj;Jed}55#h7BWcEW?wU#R5{bK9_X7o&K*{`t zb70@z4|sEha&cW!9_Wt5{&F)FV8QDP*iwW=N>oPN0dI&g=!=s21{4w(wa0fCh4~{D zzy{RZ;X6WY&2YbOyW19L0I(|+|8N6Uz?Y15^X+#Ta?(Ekq3Lz)Q1pNu+|({-XJe1+ z8<8c0%1c61{Ky#_5AnTjUT+`;N=fj4jo6pIYN5F8V^s!UKo+4u?9 zj?s5c^fkP`Jmr5;QZh0Yt)jG0E{#mAxbH@6=MF;#4Y|Ixs+aWW)xo|1Q8JR-vQl^R z+mpM)c!GO4etba}U47fgfhAY8rcPn-?v$Y2)iSBFL9^XbE?Cxc0W7Cc~xyLut0l7tWs@ML00@E%{p$6IcbDGy} zr3@>!c+}d5w$yIRHmuptZ(Xu8rc>Aavx~X~Z#CBCX3uEaF{@?zoLv2ueB+Gl)YVOU zrsbY|9+A;~t8qrKPe1SXr!UOF<{5R?tHsZ>-}tgmF3Yc(roN9bip&djLYp%5UbUcE zvs>mIXoHOKB+bZgsCSl2Q63*z=Kr!lKb5kLi)V3Msh+o+4p7Qr^txIyB`#9R-6@eBXGY@s-r$Kh}wC1N9$*!gL zndTSfXSYnxEuE5odPDP)#+KSi*}5%0S<93cnxEU6UAiUvRBe#mvLL^1t5imPqmRyS zpPpYgGtdgF-_ovbVXg9YGqNkTs^yWErM3ArlbUvI%Re(o74ns!TFtwkvwFO=EjxKT zHE4ceO(gssjMqllO^>@ia2n#-ZGL@HW?{v;9G&87m((|+ebRpJ$1uJ%XqTenu-kI# z8yTnU<~2=wW(B#qtF!YK2h_uS`E~2Fi{|Av&TLsSzck41*q&dqJjl*Me=QA>dwy5G zVNT#tDiR;iP1&cH8A#0rN1O{ZrM5p|-n{(YE&EHB-7=}=si!R_tgOq;tE=4N)w!k1 z!}z)_*}BE~mFt4$gi3_{GC)6_UAw|Y}pdE2KN8d|38&d%H1 zw2P)KP~BY5wi&#Alji2G%h#{*Eq|kSQqzuIEh}fg)i}Fp_q3K3b?mr)Rpn;v%ub)? zn&I}tmPvDSd-r6QtfLZ&39@shXB*}Pe*PFRCi0seXC9UY2RNomhqrkoXj!o-J7r#J zkl(wIts=m&@O>}aOtBz8ZA{oRHNRvLLr!-24YP7vS;y`{ztBx63{KFzWo6T@S*()j z4b2Oe`x%ME%$-}WB^CNyK=C3Ca&-%`wF?+*pM*H(kl*?}3T;*}Q;e=)Z*A1v{tx_e zM*ZbpeCa!CL4Opq`?6YV%L+jl87=j*at-tIyOy_XSjfmRkTyFoT?)Hp_>IJm@%xxa ze%sT{b9UwG>QSOhOw@38@(>*v+yUaaH! z=W`2pdKDbxc1&$qvZ`pJIXO3fX?Dvjsl%4~85%3|quiUp>UGZGAF zfK_{%_pAzXk20+`SUsAbZpia*zIpgopi6S~ODxD&iL54VZhm29^NZV>H!NvYGTEtX zv(N2x^9RkB-PO>%VU{6Wvol^GxMgxJvonmb3G7l+Bzs~QW4hbLgp+>XWPV{5hCZxs zTRj@?c>AbOU(2Q)YkV`>>)(%fF34?qhMmu6f`)Nx#O)jr_AP(lFx?xFjz7-< zFt@Ufj&!{%TeE@P%5;?58Iau8)@Gjwm#AOdVbrEwO${ruN}L>dF_(48HYlV zdaCXBilisA^B?g?lAxgM>_;$Rzw%|IeSQ?v_DOH11;r*OwuU!AC(X;Q-W_15=AN=G zq>Vs2_DC!p4~E61#h^HIGxlWX&sN3#q2BNzZzp{^-|?0@w`6il z{bO#UbT3A7K zVN!O>o>2AfeLTPJakBJ^TFWrEqA}ZuA(5Ro%Z(HJeBFGnszN4^jWG$y-da&FmDaRXF?c6)9Llgj1bwW108{Mw~WZ`p)FU-+%9Qv~x$>(!nA3Y(uz1;%3E=@wbvR2V4duE5nNGEtD?9PnM%QofLKEr;O zUG+rkHWnI~2mZ+m2QaPa@Mud7{NQSH?3vmG9RfuW7$%AbE6cy8ordfjqsYWdC4xVNzk%nhYoXYbzp55pX6M> zkZ^i~61p|KWgaK3EbDqz1LYb~IoU09^Oz(IfBkcuM)vO4ZuBPuE?azU3ulZ-pmbRcaHwHe)9SsZm+s~g>YyFeCjVp7Dc3=?A&(71?c1pO>Klw~{ z^K#DaX142bcky9Xw+<7UVQyz}5&n?JwDA$98N5KVna(;`@Q7J?&1-e<5vn$)I%FGh z9MJuf#!Rz3Xntg+E|J_dtto)Q6}rDV(fzkq(b`t)wpfop55k6B=RWC5;t)cy_lUb$I54_(W<%i?GqK}*SiGqSa)J-y**Gqe0Pp!PP-{<+$< z`R(he#+H^{%Yru7iV@z&@NDz6tu6JnT*l7w3Z;>gf;WZGF5Iiu=?-Sjb}SdOH9yvE zon@PK2D9>*Q_B#nn4e#R70O!UA7A%{J;qW8yNUK0Y9h7ufveus+$RIS_Xes^|M6xn3I z1gB;EQ;*3nSlqImOB-OKD&uC2vXBtHeWZjn;IK(OXuji&&%4^ z=pB2r7>2o5I~-zlxo-IIAJX`wWYl`TJ?M*wu$X-{QW)dvf$`!=DdAT;!ynOvF(3I2 zQ{VHp31IixNEDmo_9nxxObJ*F(i?6{6Da&WqcneI|Y0QaW zpWn>*)lL*I@b>fb8Q#P4;%+}bWjSz0`$_BzXEK=~{)nvIAnRa1eQDm=*xWEXuq!!_ zaMroKqp&b7O}Oc}NX#K_;aQLC*rcUr^oqsbgZTF?mRfeUd;by;z&dZKU5w7|+P#}h zswWn*ugiq3ZFCEB`!2MlY*Jl1H#?~`D9qlL*_-q0S25l70^HzrKC{DKs&b;_g%FEO z8EbmUC=cSXJYEk(wV9&(36-VE{Ux zw`J(EQ1(Y$$!^39wmNuo*CyC6Xr_%N^RJ46+?vTuMRtzj3w!qO|IH6qwA1GnZqChn zo~d4>kGM8epg#)HE+>Vp^e6JdRO93`JvZ-3S-P86+1(m%l(Msy*cFyueym>>swO>*$Y}sD`e|7H8wWwoXcv{>~g1U^)&|&`hxRy z{+X2pTin0X@;ytU?Bk2kpuBcqi!zn8d_HF^68OQ-&R-j56n-PdvT*N1+hyTTFJ4I$ zI-)fr>Y`<{v^LA-7e<&{TV^co+>o95tkV;#v98?G2)m6|_&#VoCl_D$e#AR-cfUZD z+^eP5yLU_+T|D@@%4%@$*0^}EqWvmt_D1;Qo133)Acc;fejhA;+0OMr+i9Y0t2sQG zaVX8Nnx0#}+A^kVrQyOX6)L^ptg`T!=hjUSPORLN?RqD`BbeBF_2bu%3HGMQV(cc% zC$m$$7u>7W!l3X*XBBV#{D6gfhfC;#Sj=;nfxI4fJ~IQI4mN|)D`e)Uc0H$?Su{Gb z+hN`pMF!bA-Xs?aw)f}-x!^H#v{m-kPX*a_z=CWyQtjlTl3L3w3OtBk$oRENtJXiw zF+@A=6kgmq!EZ%wu=PWk2-BfWjA<-;GQ3N)?zK?=jRa|_*5Ar-22)v1cNP6yCJgqm zg_c@Rv2gNhxF*!}STo71@DJGpij(n1YGr=!TmuReP1AM?OMz%LqClMK+_bBQi zv2lkxKTEV|_#R*Li<`2`8=9BwXL`i%z%T+yXf^w_-3VD)?TNFS^I)?p|x;l{<)dHg4T7;&QeE6 zy)RwwL#5Z80=Me;ZNTmk+!rz|!cWVCF}`_#!!U-YzWw&p(+rItSna&dI#drkGhMGp z-3^zJlp$=ZUy|nXp7rX>+5XOu3#|m#xBoSh1|uWHv)=NtLc7X>T8nQ9>or0 zE-4RvxufwB-Z79ooXTi3XNdW$-?r1_Ak!SE7yPT;Hm&uWxGkRl|aP#F~pZljxeR;vmP!n7-Ha%}WOMC5SB4d+b?1wYg z9{{AK^i7+^2fQowh znijRTuo~^PuWzPP=iK6NUne!|JiIRoU-z|nr_^p0w(pdWsK4)Jw^%tK=*>cS+Gu}- z`j{EFb~VSSP5;4+TYEh6F>Bn~>-$z|>N@g8qZWUMzj@1kI`>joD!>Q2* zGWLDQmvh65D0WyDm%lS2-e#QtTA<(D3Drz1>^X%yAA+2H=Kg;wUIVH}yj8;N_Es4a K+Af^UV*h`HluhUW literal 38001 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\n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -36,7 +36,7 @@ msgstr "æ°¸ä¸å¤ąæ•ˆ" #: bookwyrm/forms/admin.py:49 #, python-brace-format msgid "{i} uses" -msgstr "" +msgstr "{i} æŦĄäŊŋį”¨" #: bookwyrm/forms/admin.py:50 msgid "Unlimited" @@ -54,19 +54,19 @@ msgstr "密įĸŧ不一致" msgid "Incorrect Password" msgstr "密įĸŧ不æ­Ŗįĸē" -#: bookwyrm/forms/forms.py:54 +#: bookwyrm/forms/forms.py:58 msgid "Reading finish date cannot be before start date." msgstr "閱讀įĩæŸæ™‚間不čƒŊæ—Šæ–ŧ開始時間。" -#: bookwyrm/forms/forms.py:59 +#: bookwyrm/forms/forms.py:63 msgid "Reading stopped date cannot be before start date." msgstr "é–ąčŽ€åœæ­ĸ時間不čƒŊæ—Šæ–ŧ開始時間。" -#: bookwyrm/forms/forms.py:67 +#: bookwyrm/forms/forms.py:71 msgid "Reading stopped date cannot be in the future." msgstr "é–ąčŽ€åœæ­ĸ時間不čƒŊ是在æœĒ䞆。" -#: bookwyrm/forms/forms.py:74 +#: bookwyrm/forms/forms.py:78 msgid "Reading finished date cannot be in the future." msgstr "閱讀įĩæŸæ™‚間不čƒŊ是在æœĒ䞆。" @@ -92,7 +92,7 @@ msgstr "這個įļ˛åŸŸåˇ˛įļ“čĸĢé˜ģ擋。åĻ‚æžœäŊ čĻē垗這是個錯čĒ¤īŧŒčĢ‹č¯įĩĄ #: bookwyrm/forms/links.py:49 msgid "This link with file type has already been added for this book. If it is not visible, the domain is still pending." -msgstr "" +msgstr "包åĢæĒ”æĄˆéĄžåž‹įš„é€Ŗįĩåˇ˛įļ“čĸĢ加到這æœŦ書į•ļ中īŧŒåĻ‚果還įœ‹ä¸åˆ°īŧŒå¯čƒŊ是因į‚ē域名尚在į­‰åž…處į†ä¸­ã€‚" #: bookwyrm/forms/lists.py:26 msgid "List Order" @@ -146,7 +146,8 @@ msgid "Automatically generated report" msgstr "č‡Ē動į”Ÿæˆįš„å ąå‘Š" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 -#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72 +#: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" msgstr "åž…č™•į†" @@ -258,17 +259,24 @@ msgstr "關æŗ¨č€…" msgid "Private" msgstr "į§å¯†" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 -#: bookwyrm/templates/settings/imports/imports.html:98 +#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:173 +#: bookwyrm/templates/import/import_user.html:211 +#: bookwyrm/templates/preferences/export-user.html:112 +#: bookwyrm/templates/settings/imports/imports.html:131 +#: bookwyrm/templates/settings/imports/imports.html:221 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" msgstr "æ´ģčē" -#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:171 +#: bookwyrm/templates/import/import_user.html:209 +#: bookwyrm/templates/preferences/export-user.html:110 msgid "Complete" msgstr "åˇ˛åŽŒæˆ" -#: bookwyrm/models/import_job.py:51 +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21 msgid "Stopped" msgstr "åˇ˛åœæ­ĸ" @@ -278,10 +286,14 @@ msgstr "匯å…Ĩåˇ˛åœæ­ĸ" #: bookwyrm/models/import_job.py:356 bookwyrm/models/import_job.py:381 msgid "Error loading book" -msgstr "" +msgstr "čŽ€å–æ›¸æœŦ時遇到錯čĒ¤" #: bookwyrm/models/import_job.py:365 msgid "Could not find a match for book" +msgstr "扞不到匚配įš„書" + +#: bookwyrm/models/job.py:22 +msgid "Failed" msgstr "" #: bookwyrm/models/link.py:51 @@ -325,7 +337,7 @@ msgstr "" #: bookwyrm/models/report.py:89 msgid "Suspended user" -msgstr "" +msgstr "遭到停æŦŠįš„äŊŋį”¨č€…" #: bookwyrm/models/report.py:90 msgid "Un-suspended user" @@ -333,23 +345,23 @@ msgstr "" #: bookwyrm/models/report.py:91 msgid "Changed user permission level" -msgstr "" +msgstr "更攚äŊŋį”¨č€…æŦŠé™į­‰į´š" #: bookwyrm/models/report.py:92 msgid "Deleted user account" -msgstr "" +msgstr "åˇ˛åˆĒ除įš„äŊŋį”¨č€…å¸ŗ號" #: bookwyrm/models/report.py:93 msgid "Blocked domain" -msgstr "" +msgstr "åˇ˛å°éŽ–įš„įļ˛åŸŸ" #: bookwyrm/models/report.py:94 msgid "Approved domain" -msgstr "" +msgstr "åˇ˛é€šéŽå¯Šæ ¸įš„įļ˛åŸŸ" #: bookwyrm/models/report.py:95 msgid "Deleted item" -msgstr "" +msgstr "åˇ˛åˆĒ除įš„é …į›Ž" #: bookwyrm/models/user.py:33 bookwyrm/templates/book/book.html:307 msgid "Reviews" @@ -359,7 +371,7 @@ msgstr "æ›¸čŠ•" msgid "Comments" msgstr "評čĢ–" -#: bookwyrm/models/user.py:35 +#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139 msgid "Quotations" msgstr "åŧ•į”¨" @@ -473,7 +485,7 @@ msgstr "įšéĢ”中文" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "喔不īŧ" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -568,7 +580,7 @@ msgstr "" #: bookwyrm/templates/about/about.html:122 msgid "Moderator" -msgstr "" +msgstr "įŽĄį†č€…" #: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 msgid "Admin" @@ -597,7 +609,7 @@ msgstr "" #: bookwyrm/templates/about/layout.html:11 msgid "Active users:" -msgstr "" +msgstr "æ´ģčēäŊŋį”¨č€…īŧš" #: bookwyrm/templates/about/layout.html:15 msgid "Statuses posted:" @@ -606,7 +618,7 @@ msgstr "" #: bookwyrm/templates/about/layout.html:19 #: bookwyrm/templates/setup/config.html:74 msgid "Software version:" -msgstr "" +msgstr "čģŸéĢ”į‰ˆæœŦīŧš" #: bookwyrm/templates/about/layout.html:30 #: bookwyrm/templates/embed-layout.html:34 @@ -649,7 +661,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:277 msgid "Copied!" -msgstr "" +msgstr "複čŖŊ成功īŧ" #: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" @@ -661,7 +673,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" -msgstr "" +msgstr "將頁éĸ設į‚ēį§äēē" #: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" @@ -669,20 +681,20 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." -msgstr "" +msgstr "æ­¤į‚ēį§äēē頁éĸīŧŒåĒ有您可äģĨįœ‹åˆ°ã€‚" #: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" -msgstr "" +msgstr "將頁éĸ設į‚ēå…Ŧ開" #: bookwyrm/templates/annual_summary/layout.html:99 msgid "When you make your page private, the old key won’t give access to the page anymore. A new key will be created if the page is once again made public." -msgstr "" +msgstr "į•ļ您將您įš„頁éĸ設į‚ēį§äēē垌īŧŒčˆŠįš„įļ˛å€å°‡į„Ąæŗ•å†å­˜å–頁éĸ。åĻ‚果頁éĸ再æŦĄčĸĢ設į‚ēå…Ŧ開īŧŒé éĸ將會垗到一個新įš„įļ˛čĒŒã€‚" #: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any books in %(year)s" -msgstr "" +msgstr "垈éē憞įš„ %(display_name)s 在 %(year)s ä¸Ļæ˛’æœ‰čŽ€åŽŒäģģäŊ•æ›¸" #: bookwyrm/templates/annual_summary/layout.html:118 #, python-format @@ -960,6 +972,7 @@ msgstr "å„˛å­˜" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" @@ -977,6 +990,7 @@ msgstr "" #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/2fa.html:77 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "įĸēčĒ" @@ -1025,7 +1039,7 @@ msgstr[0] "%(count)s į‰ˆæŦĄ" #: bookwyrm/templates/book/book.html:246 msgid "You have shelved this edition in:" -msgstr "" +msgstr "æ­¤į‰ˆæœŦåˇ˛åœ¨äŊ įš„書æžļ上īŧš" #: bookwyrm/templates/book/book.html:261 #, python-format @@ -1289,23 +1303,23 @@ msgstr "čĒžč¨€:" #: bookwyrm/templates/book/edit/edit_book_form.html:97 msgid "Subjects:" -msgstr "" +msgstr "ä¸ģ旨īŧš" #: bookwyrm/templates/book/edit/edit_book_form.html:101 msgid "Add subject" -msgstr "" +msgstr "新åĸžä¸ģ旨" #: bookwyrm/templates/book/edit/edit_book_form.html:119 msgid "Remove subject" -msgstr "" +msgstr "į§ģ除ä¸ģ旨" #: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Another Subject" -msgstr "" +msgstr "新åĸžåĻ一個ä¸ģ旨" #: bookwyrm/templates/book/edit/edit_book_form.html:150 msgid "Publication" -msgstr "" +msgstr "å‡ēį‰ˆå“" #: bookwyrm/templates/book/edit/edit_book_form.html:155 msgid "Publisher:" @@ -1331,7 +1345,7 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book_form.html:200 #, python-format msgid "Author page for %(name)s" -msgstr "" +msgstr "%(name)s įš„äŊœč€…頁éĸ" #: bookwyrm/templates/book/edit/edit_book_form.html:208 msgid "Add Authors:" @@ -1401,11 +1415,11 @@ msgstr "" #: bookwyrm/templates/book/editions/editions.html:55 msgid "Can't find the edition you're looking for?" -msgstr "" +msgstr "扞不到äŊ æ­Ŗ在尋扞įš„į‰ˆæœŦīŧŸ" #: bookwyrm/templates/book/editions/editions.html:76 msgid "Add another edition" -msgstr "" +msgstr "新åĸžåĻ一個į‰ˆæœŦ" #: bookwyrm/templates/book/editions/format_filter.html:9 #: bookwyrm/templates/book/editions/language_filter.html:9 @@ -1419,15 +1433,15 @@ msgstr "čĒžč¨€:" #: bookwyrm/templates/book/editions/search_filter.html:6 msgid "Search editions" -msgstr "" +msgstr "搜尋į‰ˆæœŦ" #: bookwyrm/templates/book/file_links/add_link_modal.html:6 msgid "Add file link" -msgstr "" +msgstr "新åĸžæĒ”æĄˆé€Ŗįĩ" #: bookwyrm/templates/book/file_links/add_link_modal.html:19 msgid "Links from unknown domains will need to be approved by a moderator before they are added." -msgstr "" +msgstr "新åĸžæœĒįŸĨįļ˛åŸŸįš„é€Ŗįĩäš‹å‰éœ€čĻį”ąįŽĄį†å“Ąå¯Šæ ¸ã€‚" #: bookwyrm/templates/book/file_links/add_link_modal.html:24 msgid "URL:" @@ -1435,7 +1449,7 @@ msgstr "" #: bookwyrm/templates/book/file_links/add_link_modal.html:29 msgid "File type:" -msgstr "" +msgstr "æĒ”æĄˆéĄžåž‹īŧš" #: bookwyrm/templates/book/file_links/add_link_modal.html:48 msgid "Availability:" @@ -1465,18 +1479,21 @@ msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:34 #: bookwyrm/templates/settings/link_domains/link_table.html:8 msgid "Filetype" -msgstr "" +msgstr "æĒ”æĄˆéĄžåž‹" #: bookwyrm/templates/book/file_links/edit_links.html:35 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:25 #: bookwyrm/templates/settings/reports/report_links_table.html:5 msgid "Domain" -msgstr "" +msgstr "įļ˛åŸŸ" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:139 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:177 +#: bookwyrm/templates/preferences/export-user.html:78 #: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/imports/imports.html:255 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 #: bookwyrm/templates/settings/themes.html:111 @@ -1488,7 +1505,8 @@ msgstr "į‹€æ…‹" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:141 +#: bookwyrm/templates/settings/imports/imports.html:174 +#: bookwyrm/templates/settings/imports/imports.html:253 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:108 msgid "Actions" @@ -1497,16 +1515,16 @@ msgstr "動äŊœ" #: bookwyrm/templates/book/file_links/edit_links.html:48 #: bookwyrm/templates/settings/link_domains/link_table.html:21 msgid "Unknown user" -msgstr "" +msgstr "æœĒįŸĨįš„äŊŋį”¨č€…" #: bookwyrm/templates/book/file_links/edit_links.html:57 #: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" -msgstr "" +msgstr "æĒĸčˆ‰åžƒåœžč¨Šæ¯" #: bookwyrm/templates/book/file_links/edit_links.html:102 msgid "No links available for this book." -msgstr "" +msgstr "æ­¤æ›¸æ˛Ąæœ‰å¯į”¨é€Ŗįĩã€‚" #: bookwyrm/templates/book/file_links/edit_links.html:113 #: bookwyrm/templates/book/file_links/links.html:18 @@ -1523,7 +1541,7 @@ msgstr "" #: bookwyrm/templates/book/file_links/links.html:47 msgid "No links available" -msgstr "" +msgstr "æ˛Ąæœ‰å¯į”¨é€Ŗįĩ" #: bookwyrm/templates/book/file_links/verification_modal.html:5 msgid "Leaving BookWyrm" @@ -1593,11 +1611,11 @@ msgstr "" #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Edit status" -msgstr "" +msgstr "įˇ¨čŧ¯į‹€æ…‹" #: bookwyrm/templates/confirm_email/confirm_email.html:4 msgid "Confirm email" -msgstr "" +msgstr "įĸēčĒé›ģ子éƒĩäģļ" #: bookwyrm/templates/confirm_email/confirm_email.html:7 msgid "Confirm your email address" @@ -1630,7 +1648,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/resend.html:5 #: bookwyrm/templates/confirm_email/resend_modal.html:5 msgid "Resend confirmation link" -msgstr "" +msgstr "重新å‚ŗ送įĸēčĒé€Ŗįĩ" #: bookwyrm/templates/confirm_email/resend_modal.html:15 #: bookwyrm/templates/landing/layout.html:68 @@ -1642,7 +1660,7 @@ msgstr "éƒĩįŽąåœ°å€:" #: bookwyrm/templates/confirm_email/resend_modal.html:30 msgid "Resend link" -msgstr "" +msgstr "重新å‚ŗ送é€Ŗįĩ" #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" @@ -1670,7 +1688,7 @@ msgstr "äŊŋäŊ įš„äŊŋį”¨č€…čŗ‡æ–™å¯äģĨčĸĢå…ļ厃 BookWyrm äŊŋį”¨č€…į™ŧįžã€‚" #: bookwyrm/templates/directory/directory.html:21 msgid "Join Directory" -msgstr "" +msgstr "加å…Ĩčŗ‡æ–™å¤ž" #: bookwyrm/templates/directory/directory.html:24 #, python-format @@ -1750,7 +1768,7 @@ msgstr "" #: bookwyrm/templates/discover/card-header.html:13 #, python-format msgid "%(username)s finished reading %(book_title)s" -msgstr "" +msgstr "%(username)s åˇ˛čŽ€åŽŒ %(book_title)s" #: bookwyrm/templates/discover/card-header.html:18 #, python-format @@ -1765,7 +1783,7 @@ msgstr "" #: bookwyrm/templates/discover/card-header.html:27 #, python-format msgid "%(username)s reviewed %(book_title)s" -msgstr "" +msgstr "%(username)s åˇ˛čŠ•čĢ– %(book_title)s" #: bookwyrm/templates/discover/card-header.html:31 #, python-format @@ -2490,7 +2508,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/group.html:100 msgid "Congratulations, you've finished the tour! Now you know the basics, but there is lots more to explore on your own. Happy reading!" -msgstr "" +msgstr "恭喜īŧŒæ‚¨åˇ˛įģåŽŒæˆäē†å°ŽčĻŊīŧįžåœ¨æ‚¨åˇ˛įģįŸĨ道åŸēį¤ŽįŸĨ識īŧŒäŊ†é‚„有垈多功čƒŊčƒŊ夠č‡ĒåˇąæŽĸį´ĸīŧŒįĨæ‚¨é–ąčŽ€åŋĢ樂īŧ" #: bookwyrm/templates/guided_tour/group.html:115 msgid "End tour" @@ -2726,7 +2744,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:55 #: bookwyrm/templates/user/groups.html:6 bookwyrm/templates/user/layout.html:95 msgid "Groups" -msgstr "" +msgstr "įž¤įĩ„" #: bookwyrm/templates/guided_tour/user_groups.html:31 msgid "Let's create a new group!" @@ -2771,7 +2789,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:11 #: bookwyrm/templates/user/layout.html:20 bookwyrm/templates/user/user.html:14 msgid "User Profile" -msgstr "äŊŋį”¨č€…äŊŋį”¨č€…čŗ‡æ–™" +msgstr "äŊŋį”¨č€…čŗ‡æ–™" #: bookwyrm/templates/guided_tour/user_profile.html:31 msgid "This tab shows everything you have read towards your annual reading goal, or allows you to set one. You don't have to set a reading goal if that's not your thing!" @@ -2816,110 +2834,120 @@ msgid "No activities for this hashtag yet!" msgstr "" #: bookwyrm/templates/import/import.html:5 -#: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:66 -msgid "Import Books" -msgstr "匯å…Ĩ書į›Ž" +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" -#: bookwyrm/templates/import/import.html:13 +#: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:21 +#: bookwyrm/templates/import/import.html:20 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:27 +#: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:34 +#: bookwyrm/templates/import/import.html:33 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:38 +#: bookwyrm/templates/import/import.html:37 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:53 +#: bookwyrm/templates/import/import.html:52 msgid "Data source:" msgstr "čŗ‡æ–™äž†æē:" -#: bookwyrm/templates/import/import.html:59 +#: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:62 +#: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:65 +#: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:68 +#: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:71 +#: bookwyrm/templates/import/import.html:70 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:77 +#: bookwyrm/templates/import/import.html:76 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:86 +#: bookwyrm/templates/import/import.html:85 +#: bookwyrm/templates/import/import_user.html:49 msgid "Data file:" msgstr "čŗ‡æ–™æĒ”æĄˆ:" -#: bookwyrm/templates/import/import.html:94 +#: bookwyrm/templates/import/import.html:93 msgid "Include reviews" msgstr "į´å…Ĩæ›¸čŠ•" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:98 msgid "Privacy setting for imported reviews:" msgstr "匯å…Ĩæ›¸čŠ•įš„į§éšąč¨­åŽš" -#: bookwyrm/templates/import/import.html:106 -#: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:43 +#: bookwyrm/templates/import/import.html:105 +#: bookwyrm/templates/import/import.html:107 +#: bookwyrm/templates/import/import_user.html:155 +#: bookwyrm/templates/import/import_user.html:157 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "匯å…Ĩ" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:108 +#: bookwyrm/templates/import/import_user.html:158 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:117 +#: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:125 +#: bookwyrm/templates/import/import.html:124 +#: bookwyrm/templates/import/import_user.html:166 msgid "Recent Imports" msgstr "最čŋ‘įš„匯å…Ĩ" -#: bookwyrm/templates/import/import.html:130 -#: bookwyrm/templates/settings/imports/imports.html:120 +#: bookwyrm/templates/import/import.html:129 +#: bookwyrm/templates/import/import_user.html:171 +#: bookwyrm/templates/settings/imports/imports.html:153 +#: bookwyrm/templates/settings/imports/imports.html:243 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:133 +#: bookwyrm/templates/import/import.html:132 +#: bookwyrm/templates/import/import_user.html:174 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:136 -#: bookwyrm/templates/settings/imports/imports.html:129 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/settings/imports/imports.html:162 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:145 +#: bookwyrm/templates/import/import.html:144 +#: bookwyrm/templates/import/import_user.html:183 +#: bookwyrm/templates/preferences/export-user.html:87 msgid "No recent imports" msgstr "į„Ąæœ€čŋ‘įš„匯å…Ĩ" @@ -2955,7 +2983,8 @@ msgid "Refresh" msgstr "" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:161 +#: bookwyrm/templates/settings/imports/imports.html:194 +#: bookwyrm/templates/settings/imports/imports.html:271 msgid "Stop import" msgstr "" @@ -3051,6 +3080,133 @@ msgstr "" msgid "Update import" msgstr "" +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(user_import_hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:41 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:43 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:60 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:71 +#: bookwyrm/templates/shelf/shelf.html:26 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:74 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:80 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:83 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:92 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:112 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:123 +msgid "Reading goals" +msgstr "閱讀į›Žæ¨™" + +#: bookwyrm/templates/import/import_user.html:126 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:130 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:133 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:136 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:142 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +msgid "Saved lists" +msgstr "" + #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 msgid "Import Troubleshooting" @@ -3071,7 +3227,7 @@ msgid "Reject" msgstr "" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:138 +#: bookwyrm/templates/settings/imports/imports.html:171 msgid "Failed items" msgstr "" @@ -3223,7 +3379,7 @@ msgstr "" #: bookwyrm/templates/layout.html:39 msgid "Search for a book, user, or list" -msgstr "" +msgstr "搜尋書įąã€äŊŋį”¨č€…æˆ–åˆ—čĄ¨" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 msgid "Scan Barcode" @@ -3846,6 +4002,16 @@ msgstr "" msgid "has changed the description of %(group_name)s" msgstr "" +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" msgstr "åˆĒ除通įŸĨ" @@ -4089,7 +4255,7 @@ msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:54 +#: bookwyrm/templates/preferences/layout.html:62 msgid "Blocked Users" msgstr "封鎖įš„äŊŋį”¨č€…" @@ -4224,13 +4390,65 @@ msgstr "" msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" msgstr "" +#: bookwyrm/templates/preferences/export-user.html:5 +#: bookwyrm/templates/preferences/export-user.html:8 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:14 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:17 +msgid "

    Your file will include:

    • User profile
    • Most user settings
    • Reading goals
    • Shelves
    • Reading history
    • Book reviews
    • Statuses
    • Your own lists and saved lists
    • Which users you follow and block

    Your file will not include:

    • Direct messages
    • Replies to your statuses
    • Groups
    • Favorites
    " +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:43 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:46 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:51 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:60 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:67 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:69 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:75 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:81 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:125 +msgid "Download your export" +msgstr "" + #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 -msgid "CSV Export" +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" msgstr "" #: bookwyrm/templates/preferences/export.html:13 -msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." msgstr "" #: bookwyrm/templates/preferences/export.html:20 @@ -4249,11 +4467,7 @@ msgstr "" msgid "Data" msgstr "" -#: bookwyrm/templates/preferences/layout.html:47 -msgid "CSV export" -msgstr "" - -#: bookwyrm/templates/preferences/layout.html:50 +#: bookwyrm/templates/preferences/layout.html:58 msgid "Relationships" msgstr "關äŋ‚" @@ -4739,7 +4953,8 @@ msgid "Active Tasks" msgstr "" #: bookwyrm/templates/settings/celery.html:131 -#: bookwyrm/templates/settings/imports/imports.html:113 +#: bookwyrm/templates/settings/imports/imports.html:146 +#: bookwyrm/templates/settings/imports/imports.html:236 msgid "ID" msgstr "" @@ -5129,9 +5344,14 @@ msgid "No instances found" msgstr "" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 msgid "Stop import?" msgstr "" +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" msgstr "" @@ -5144,70 +5364,107 @@ msgstr "" msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:36 +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:50 +#: bookwyrm/templates/settings/imports/imports.html:51 msgid "Users are currently unable to start new imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:55 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Enable imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:63 +#: bookwyrm/templates/settings/imports/imports.html:64 msgid "Limit the amount of imports" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:74 +#: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:75 +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:108 msgid "Set the value to 0 to not enforce any limit." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:78 +#: bookwyrm/templates/settings/imports/imports.html:79 msgid "Set import limit to" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:81 msgid "books every" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:82 +#: bookwyrm/templates/settings/imports/imports.html:83 msgid "days." msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:86 +#: bookwyrm/templates/settings/imports/imports.html:87 msgid "Set limit" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:102 -msgid "Completed" +#: bookwyrm/templates/settings/imports/imports.html:96 +msgid "Limit how often users can import and export" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:116 -msgid "User" +#: bookwyrm/templates/settings/imports/imports.html:107 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:111 +msgid "Restrict user imports and exports to once every " +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:113 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:117 +msgid "Change limit" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:125 -msgid "Date Updated" -msgstr "" - -#: bookwyrm/templates/settings/imports/imports.html:132 -msgid "Pending items" +msgid "Book Imports" msgstr "" #: bookwyrm/templates/settings/imports/imports.html:135 +#: bookwyrm/templates/settings/imports/imports.html:225 +msgid "Completed" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:149 +#: bookwyrm/templates/settings/imports/imports.html:239 +msgid "User" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:158 +#: bookwyrm/templates/settings/imports/imports.html:248 +msgid "Date Updated" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:165 +msgid "Pending items" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:168 msgid "Successful items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:170 +#: bookwyrm/templates/settings/imports/imports.html:203 +#: bookwyrm/templates/settings/imports/imports.html:295 msgid "No matching imports found." msgstr "" +#: bookwyrm/templates/settings/imports/imports.html:215 +msgid "User Imports" +msgstr "" + #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 @@ -6020,17 +6277,15 @@ msgstr "åģēįĢ‹æ›¸æžļ" msgid "Edit Shelf" msgstr "įˇ¨čŧ¯æ›¸æžļ" -#: bookwyrm/templates/shelf/shelf.html:26 -#: bookwyrm/templates/user/relationships/followers.html:18 -#: bookwyrm/templates/user/relationships/following.html:18 -msgid "User profile" -msgstr "" - #: bookwyrm/templates/shelf/shelf.html:41 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "所有書į›Ž" +#: bookwyrm/templates/shelf/shelf.html:66 +msgid "Import Books" +msgstr "匯å…Ĩ書į›Ž" + #: bookwyrm/templates/shelf/shelf.html:99 #, python-format msgid "%(formatted_count)s book" @@ -6210,7 +6465,7 @@ msgstr "" #: bookwyrm/templates/snippets/create_status/review.html:24 #, python-format msgid "Your review of '%(book_title)s'" -msgstr "" +msgstr "äŊ å°ã€Š%(book_title)s》įš„æ›¸čŠ•" #: bookwyrm/templates/snippets/create_status/review.html:39 msgid "Review:" @@ -6277,11 +6532,11 @@ msgstr "文äģļ:" #: bookwyrm/templates/snippets/footer.html:42 #, python-format msgid "Support %(site_name)s on %(support_title)s" -msgstr "" +msgstr "在 %(support_title)s 上支持 %(site_name)s" #: bookwyrm/templates/snippets/footer.html:49 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." -msgstr "" +msgstr "BookWyrm 是免č˛ģ開æēčģŸéĢ”īŧŒäŊ å¯äģĨ在 GitHub č˛ĸįģæˆ–å›žå ąå•éĄŒã€‚" #: bookwyrm/templates/snippets/form_rate_stars.html:20 #: bookwyrm/templates/snippets/stars.html:23 @@ -6590,12 +6845,12 @@ msgstr "" #: bookwyrm/templates/snippets/status/headers/read.html:10 #, python-format msgid "finished reading %(book)s by %(author_name)s" -msgstr "" +msgstr "čŽ€åŽŒäē† %(author_name)s įš„ %(book)s" #: bookwyrm/templates/snippets/status/headers/read.html:17 #, python-format msgid "finished reading %(book)s" -msgstr "" +msgstr "čŽ€åŽŒäē† %(book)s" #: bookwyrm/templates/snippets/status/headers/reading.html:10 #, python-format @@ -6759,7 +7014,7 @@ msgstr "關æŗ¨čĢ‹æą‚" #: bookwyrm/templates/user/reviews_comments.html:6 #: bookwyrm/templates/user/reviews_comments.html:12 msgid "Reviews and Comments" -msgstr "" +msgstr "æ›¸čŠ•å’ŒčŠ•čĢ–" #: bookwyrm/templates/user/lists.html:16 #, python-format @@ -6856,7 +7111,7 @@ msgstr[0] "" #: bookwyrm/templates/user/user_preview.html:31 #, python-format msgid "%(counter)s following" -msgstr "關æŗ¨č‘— %(counter)s äēē" +msgstr "æ­Ŗ在čŋŊ蚤 %(counter)s äēē" #: bookwyrm/templates/user/user_preview.html:45 #, python-format From bf52eeaa9ee5816a0c8e71e3d9d440d61bd078be Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 Mar 2024 16:15:02 -0700 Subject: [PATCH 160/200] Bump version to 0.7.3. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7486fdbc5..f38fc5393 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.2 +0.7.3 From 145c67dd214f9df9d97ca12dad0b4f4b88125ef6 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 26 Mar 2024 12:41:04 +0100 Subject: [PATCH 161/200] Merge BookwyrmExportJob export_data field back into one with dynamic storage backend --- ...198_alter_bookwyrmexportjob_export_data.py | 23 +++++++++++ .../0198_export_job_separate_file_fields.py | 28 ------------- bookwyrm/models/bookwyrm_export_job.py | 41 +++++++------------ bookwyrm/settings.py | 20 +++++++-- 4 files changed, 54 insertions(+), 58 deletions(-) create mode 100644 bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py delete mode 100644 bookwyrm/migrations/0198_export_job_separate_file_fields.py diff --git a/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py b/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py new file mode 100644 index 000000000..552584d2b --- /dev/null +++ b/bookwyrm/migrations/0198_alter_bookwyrmexportjob_export_data.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.25 on 2024-03-26 11:37 + +import bookwyrm.models.bookwyrm_export_job +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0197_merge_20240324_0235"), + ] + + operations = [ + migrations.AlterField( + model_name="bookwyrmexportjob", + name="export_data", + field=models.FileField( + null=True, + storage=bookwyrm.models.bookwyrm_export_job.select_exports_storage, + upload_to="", + ), + ), + ] diff --git a/bookwyrm/migrations/0198_export_job_separate_file_fields.py b/bookwyrm/migrations/0198_export_job_separate_file_fields.py deleted file mode 100644 index d9dd87eee..000000000 --- a/bookwyrm/migrations/0198_export_job_separate_file_fields.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.25 on 2024-03-24 11:20 - -import bookwyrm.storage_backends -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0197_merge_20240324_0235"), - ] - - operations = [ - migrations.RenameField( - model_name="bookwyrmexportjob", - old_name="export_data", - new_name="export_data_file", - ), - migrations.AddField( - model_name="bookwyrmexportjob", - name="export_data_s3", - field=models.FileField( - null=True, - storage=bookwyrm.storage_backends.ExportsS3Storage, - upload_to="", - ), - ), - ] diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index c94c6bec0..8fd108014 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -12,8 +12,9 @@ from django.db.models import Q from django.core.serializers.json import DjangoJSONEncoder from django.core.files.base import ContentFile from django.utils import timezone +from django.utils.module_loading import import_string -from bookwyrm import settings, storage_backends +from bookwyrm import settings from bookwyrm.models import AnnualGoal, ReadThrough, ShelfBook, List, ListItem from bookwyrm.models import Review, Comment, Quotation @@ -34,33 +35,19 @@ class BookwyrmAwsSession(BotoSession): return super().client("s3", *args, **kwargs) +def select_exports_storage(): + """callable to allow for dependency on runtime configuration""" + cls = import_string(settings.EXPORTS_STORAGE) + return cls() + + class BookwyrmExportJob(ParentJob): """entry for a specific request to export a bookwyrm user""" - # Only one of these fields is used, dependent on the configuration. - export_data_file = FileField(null=True, storage=storage_backends.ExportsFileStorage) - export_data_s3 = FileField(null=True, storage=storage_backends.ExportsS3Storage) - + export_data = FileField(null=True, storage=select_exports_storage) export_json = JSONField(null=True, encoder=DjangoJSONEncoder) json_completed = BooleanField(default=False) - @property - def export_data(self): - """returns the file field of the configured storage backend""" - # TODO: We could check whether a field for a different backend is - # filled, to support migrating to a different backend. - if settings.USE_S3: - return self.export_data_s3 - return self.export_data_file - - @export_data.setter - def export_data(self, value): - """sets the file field of the configured storage backend""" - if settings.USE_S3: - self.export_data_s3 = value - else: - self.export_data_file = value - def start_job(self): """Start the job""" @@ -265,15 +252,15 @@ class AddFileToTar(ChildJob): # Create archive and store file name s3_tar.tar() - export_job.export_data_s3 = s3_archive_path - export_job.save() + export_job.export_data = s3_archive_path + export_job.save(update_fields=["export_data"]) # Delete temporary files S3Boto3Storage.delete(storage, export_json_tmp_file) else: - export_job.export_data_file = f"{export_task_id}.tar.gz" - with export_job.export_data_file.open("wb") as tar_file: + export_job.export_data = f"{export_task_id}.tar.gz" + with export_job.export_data.open("wb") as tar_file: with BookwyrmTarFile.open(mode="w:gz", fileobj=tar_file) as tar: # save json file tar.write_bytes(export_json_bytes) @@ -285,7 +272,7 @@ class AddFileToTar(ChildJob): for edition in editions: if edition.cover: tar.add_image(edition.cover, directory="images/") - export_job.save() + export_job.save(update_fields=["export_data"]) self.complete_job() diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index d2ba490b7..1e778ad15 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -390,16 +390,20 @@ if USE_S3: # S3 Static settings STATIC_LOCATION = "static" STATIC_URL = f"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/" + STATIC_FULL_URL = STATIC_URL STATICFILES_STORAGE = "bookwyrm.storage_backends.StaticStorage" # S3 Media settings MEDIA_LOCATION = "images" MEDIA_URL = f"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_LOCATION}/" MEDIA_FULL_URL = MEDIA_URL - STATIC_FULL_URL = STATIC_URL DEFAULT_FILE_STORAGE = "bookwyrm.storage_backends.ImagesStorage" + # S3 Exports settings + EXPORTS_STORAGE = "bookwyrm.storage_backends.ExportsS3Storage" + # Content Security Policy CSP_DEFAULT_SRC = ["'self'", AWS_S3_CUSTOM_DOMAIN] + CSP_ADDITIONAL_HOSTS CSP_SCRIPT_SRC = ["'self'", AWS_S3_CUSTOM_DOMAIN] + CSP_ADDITIONAL_HOSTS elif USE_AZURE: + # Azure settings AZURE_ACCOUNT_NAME = env("AZURE_ACCOUNT_NAME") AZURE_ACCOUNT_KEY = env("AZURE_ACCOUNT_KEY") AZURE_CONTAINER = env("AZURE_CONTAINER") @@ -409,6 +413,7 @@ elif USE_AZURE: STATIC_URL = ( f"{PROTOCOL}://{AZURE_CUSTOM_DOMAIN}/{AZURE_CONTAINER}/{STATIC_LOCATION}/" ) + STATIC_FULL_URL = STATIC_URL STATICFILES_STORAGE = "bookwyrm.storage_backends.AzureStaticStorage" # Azure Media settings MEDIA_LOCATION = "images" @@ -416,15 +421,24 @@ elif USE_AZURE: f"{PROTOCOL}://{AZURE_CUSTOM_DOMAIN}/{AZURE_CONTAINER}/{MEDIA_LOCATION}/" ) MEDIA_FULL_URL = MEDIA_URL - STATIC_FULL_URL = STATIC_URL DEFAULT_FILE_STORAGE = "bookwyrm.storage_backends.AzureImagesStorage" + # Azure Exports settings + EXPORTS_STORAGE = None # not implemented yet + # Content Security Policy CSP_DEFAULT_SRC = ["'self'", AZURE_CUSTOM_DOMAIN] + CSP_ADDITIONAL_HOSTS CSP_SCRIPT_SRC = ["'self'", AZURE_CUSTOM_DOMAIN] + CSP_ADDITIONAL_HOSTS else: + # Static settings STATIC_URL = "/static/" + STATIC_FULL_URL = f"{PROTOCOL}://{DOMAIN}{STATIC_URL}" + STATICFILES_STORAGE = "django.contrib.staticfiles.storage.StaticFilesStorage" + # Media settings MEDIA_URL = "/images/" MEDIA_FULL_URL = f"{PROTOCOL}://{DOMAIN}{MEDIA_URL}" - STATIC_FULL_URL = f"{PROTOCOL}://{DOMAIN}{STATIC_URL}" + DEFAULT_FILE_STORAGE = "django.core.files.storage.FileSystemStorage" + # Exports settings + EXPORTS_STORAGE = "bookwyrm.storage_backends.ExportsFileStorage" + # Content Security Policy CSP_DEFAULT_SRC = ["'self'"] + CSP_ADDITIONAL_HOSTS CSP_SCRIPT_SRC = ["'self'"] + CSP_ADDITIONAL_HOSTS From ef57c0bc8b23bf4bb1dff7e4fc9ba3cb95db035d Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 26 Mar 2024 13:16:08 +0100 Subject: [PATCH 162/200] Check last user export too in post handler --- bookwyrm/views/preferences/export.py | 45 ++++++++++++++++------------ 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index f501f331b..de243586d 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -148,21 +148,35 @@ class Export(View): @method_decorator(login_required, name="dispatch") class ExportUser(View): """ - Let users export user data to import into another Bookwyrm instance - This view creates signed URLs to pre-processed export files in - s3 storage on load (if they exist) and allows the user to create - a new file. + Let users request and download an archive of user data to import into + another Bookwyrm instance. """ + user_jobs = None + + def setup(self, request, *args, **kwargs): + super().setup(request, *args, **kwargs) + + self.user_jobs = BookwyrmExportJob.objects.filter(user=request.user).order_by( + "-created_date" + ) + + def new_export_blocked_until(self): + """whether the user is allowed to request a new export""" + last_job = self.user_jobs.first() + if not last_job: + return None + site = models.SiteSettings.objects.get() + blocked_until = last_job.created_date + timedelta( + hours=site.user_import_time_limit + ) + return blocked_until if blocked_until > timezone.now() else None + def get(self, request): """Request tar file""" - jobs = BookwyrmExportJob.objects.filter(user=request.user).order_by( - "-created_date" - ) - exports = [] - for job in jobs: + for job in self.user_jobs: export = {"job": job} if job.export_data: @@ -178,16 +192,7 @@ class ExportUser(View): exports.append(export) - site = models.SiteSettings.objects.get() - hours = site.user_import_time_limit - allowed = ( - jobs.first().created_date < timezone.now() - timedelta(hours=hours) - if jobs.first() - else True - ) - next_available = ( - jobs.first().created_date + timedelta(hours=hours) if not allowed else False - ) + next_available = self.new_export_blocked_until() paginated = Paginator(exports, settings.PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = { @@ -202,6 +207,8 @@ class ExportUser(View): def post(self, request): """Trigger processing of a new user export file""" + if self.new_export_blocked_until() is not None: + return HttpResponse(status=429) # Too Many Requests job = BookwyrmExportJob.objects.create(user=request.user) job.start_job() From ed2e9e5ea87746bb50f2602a40c81bd648564f55 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 26 Mar 2024 13:18:13 +0100 Subject: [PATCH 163/200] Merge migration --- bookwyrm/migrations/0199_merge_20240326_1217.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0199_merge_20240326_1217.py diff --git a/bookwyrm/migrations/0199_merge_20240326_1217.py b/bookwyrm/migrations/0199_merge_20240326_1217.py new file mode 100644 index 000000000..7794af54a --- /dev/null +++ b/bookwyrm/migrations/0199_merge_20240326_1217.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.25 on 2024-03-26 12:17 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0198_alter_bookwyrmexportjob_export_data"), + ("bookwyrm", "0198_book_search_vector_author_aliases"), + ] + + operations = [] From 98600440d8c2315205616e6bd2effe1aafc667df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20C=C3=A1mara?= Date: Tue, 26 Mar 2024 17:14:09 +0000 Subject: [PATCH 164/200] Remove twitter from README.md The Twitter/X account doesn't seem to exist, so removing the badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f8b2eb1f6..7e27d44e6 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ BookWyrm is a social network for tracking your reading, talking about books, wri ## Links [![Mastodon Follow](https://img.shields.io/mastodon/follow/000146121?domain=https%3A%2F%2Ftech.lgbt&style=social)](https://tech.lgbt/@bookwyrm) -[![Twitter Follow](https://img.shields.io/twitter/follow/BookWyrmSocial?style=social)](https://twitter.com/BookWyrmSocial) - [Project homepage](https://joinbookwyrm.com/) - [Support](https://patreon.com/bookwyrm) From 9685ae5a0a7f7ae073915554498c2f2bda546df5 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 26 Mar 2024 16:18:30 +0100 Subject: [PATCH 165/200] Consolidate BookwyrmExportJob into two tasks Creating the export JSON and export TAR are now the only two tasks. --- bookwyrm/models/bookwyrm_export_job.py | 565 ++++++++++--------------- 1 file changed, 218 insertions(+), 347 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 8fd108014..8c3eeb41f 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -7,20 +7,19 @@ from boto3.session import Session as BotoSession from s3_tar import S3Tar from storages.backends.s3boto3 import S3Boto3Storage -from django.db.models import CASCADE, BooleanField, FileField, ForeignKey, JSONField +from django.db.models import BooleanField, FileField, JSONField from django.db.models import Q from django.core.serializers.json import DjangoJSONEncoder from django.core.files.base import ContentFile -from django.utils import timezone from django.utils.module_loading import import_string from bookwyrm import settings -from bookwyrm.models import AnnualGoal, ReadThrough, ShelfBook, List, ListItem +from bookwyrm.models import AnnualGoal, ReadThrough, ShelfBook, ListItem from bookwyrm.models import Review, Comment, Quotation from bookwyrm.models import Edition from bookwyrm.models import UserFollows, User, UserBlocks -from bookwyrm.models.job import ParentJob, ChildJob, ParentTask +from bookwyrm.models.job import ParentJob from bookwyrm.tasks import app, IMPORTS from bookwyrm.utils.tar import BookwyrmTarFile @@ -49,40 +48,12 @@ class BookwyrmExportJob(ParentJob): json_completed = BooleanField(default=False) def start_job(self): - """Start the job""" + """schedule the first task""" - task = start_export_task.delay(job_id=self.id, no_children=False) + task = create_export_json_task.delay(job_id=self.id) self.task_id = task.id self.save(update_fields=["task_id"]) - def notify_child_job_complete(self): - """let the job know when the items get work done""" - - if self.complete: - return - - self.updated_date = timezone.now() - self.save(update_fields=["updated_date"]) - - if not self.complete and self.has_completed: - if not self.json_completed: - try: - self.json_completed = True - self.save(update_fields=["json_completed"]) - - tar_job = AddFileToTar.objects.create( - parent_job=self, parent_export_job=self - ) - tar_job.start_job() - - except Exception as err: # pylint: disable=broad-except - logger.exception("job %s failed with error: %s", self.id, err) - tar_job.set_status("failed") - self.stop_job(reason="failed") - - else: - self.complete_job() - def url2relativepath(url: str) -> str: """turn an absolute URL into a relative filesystem path""" @@ -90,345 +61,245 @@ def url2relativepath(url: str) -> str: return unquote(parsed.path[1:]) -class AddBookToUserExportJob(ChildJob): - """append book metadata for each book in an export""" +@app.task(queue=IMPORTS) +def create_export_json_task(job_id): + """create the JSON data for the export""" - edition = ForeignKey(Edition, on_delete=CASCADE) - - # pylint: disable=too-many-locals - def start_job(self): - """Start the job""" - try: - - book = {} - book["work"] = self.edition.parent_work.to_activity() - book["edition"] = self.edition.to_activity() - - if book["edition"].get("cover"): - book["edition"]["cover"]["url"] = url2relativepath( - book["edition"]["cover"]["url"] - ) - - # authors - book["authors"] = [] - for author in self.edition.authors.all(): - book["authors"].append(author.to_activity()) - - # Shelves this book is on - # Every ShelfItem is this book so we don't other serializing - book["shelves"] = [] - shelf_books = ( - ShelfBook.objects.select_related("shelf") - .filter(user=self.parent_job.user, book=self.edition) - .distinct() - ) - - for shelfbook in shelf_books: - book["shelves"].append(shelfbook.shelf.to_activity()) - - # Lists and ListItems - # ListItems include "notes" and "approved" so we need them - # even though we know it's this book - book["lists"] = [] - list_items = ListItem.objects.filter( - book=self.edition, user=self.parent_job.user - ).distinct() - - for item in list_items: - list_info = item.book_list.to_activity() - list_info[ - "privacy" - ] = item.book_list.privacy # this isn't serialized so we add it - list_info["list_item"] = item.to_activity() - book["lists"].append(list_info) - - # Statuses - # Can't use select_subclasses here because - # we need to filter on the "book" value, - # which is not available on an ordinary Status - for status in ["comments", "quotations", "reviews"]: - book[status] = [] - - comments = Comment.objects.filter( - user=self.parent_job.user, book=self.edition - ).all() - for status in comments: - obj = status.to_activity() - obj["progress"] = status.progress - obj["progress_mode"] = status.progress_mode - book["comments"].append(obj) - - quotes = Quotation.objects.filter( - user=self.parent_job.user, book=self.edition - ).all() - for status in quotes: - obj = status.to_activity() - obj["position"] = status.position - obj["endposition"] = status.endposition - obj["position_mode"] = status.position_mode - book["quotations"].append(obj) - - reviews = Review.objects.filter( - user=self.parent_job.user, book=self.edition - ).all() - for status in reviews: - obj = status.to_activity() - book["reviews"].append(obj) - - # readthroughs can't be serialized to activity - book_readthroughs = ( - ReadThrough.objects.filter(user=self.parent_job.user, book=self.edition) - .distinct() - .values() - ) - book["readthroughs"] = list(book_readthroughs) - - self.parent_job.export_json["books"].append(book) - self.parent_job.save(update_fields=["export_json"]) - self.complete_job() - - except Exception as err: # pylint: disable=broad-except - logger.exception( - "AddBookToUserExportJob %s Failed with error: %s", self.id, err - ) - self.set_status("failed") - - -class AddFileToTar(ChildJob): - """add files to export""" - - parent_export_job = ForeignKey( - BookwyrmExportJob, on_delete=CASCADE, related_name="child_edition_export_jobs" - ) - - def start_job(self): - """Start the job""" - - # NOTE we are doing this all in one big job, - # which has the potential to block a thread - # This is because we need to refer to the same s3_job - # or BookwyrmTarFile whilst writing - # Using a series of jobs in a loop would be better - - try: - export_job = self.parent_export_job - export_task_id = str(export_job.task_id) - - export_json_bytes = ( - DjangoJSONEncoder().encode(export_job.export_json).encode("utf-8") - ) - - user = export_job.user - editions = get_books_for_user(user) - - if settings.USE_S3: - # Connection for writing temporary files - storage = S3Boto3Storage() - - # Handle for creating the final archive - s3_archive_path = f"exports/{export_task_id}.tar.gz" - s3_tar = S3Tar( - settings.AWS_STORAGE_BUCKET_NAME, - s3_archive_path, - session=BookwyrmAwsSession(), - ) - - # Save JSON file to a temporary location - export_json_tmp_file = f"exports/{export_task_id}/archive.json" - S3Boto3Storage.save( - storage, - export_json_tmp_file, - ContentFile(export_json_bytes), - ) - s3_tar.add_file(export_json_tmp_file) - - # Add avatar image if present - if user.avatar: - s3_tar.add_file(f"images/{user.avatar.name}") - - for edition in editions: - if edition.cover: - s3_tar.add_file(f"images/{edition.cover.name}") - - # Create archive and store file name - s3_tar.tar() - export_job.export_data = s3_archive_path - export_job.save(update_fields=["export_data"]) - - # Delete temporary files - S3Boto3Storage.delete(storage, export_json_tmp_file) - - else: - export_job.export_data = f"{export_task_id}.tar.gz" - with export_job.export_data.open("wb") as tar_file: - with BookwyrmTarFile.open(mode="w:gz", fileobj=tar_file) as tar: - # save json file - tar.write_bytes(export_json_bytes) - - # Add avatar image if present - if user.avatar: - tar.add_image(user.avatar, directory="images/") - - for edition in editions: - if edition.cover: - tar.add_image(edition.cover, directory="images/") - export_job.save(update_fields=["export_data"]) - - self.complete_job() - - except Exception as err: # pylint: disable=broad-except - logger.exception("AddFileToTar %s Failed with error: %s", self.id, err) - self.stop_job(reason="failed") - self.parent_job.stop_job(reason="failed") - - -@app.task(queue=IMPORTS, base=ParentTask) -def start_export_task(**kwargs): - """trigger the child tasks for user export""" - - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) + job = BookwyrmExportJob.objects.get(id=job_id) # don't start the job if it was stopped from the UI if job.complete: return - try: - - # prepare the initial file and base json - job.export_json = job.user.to_activity() - job.save(update_fields=["export_json"]) - - # let's go - json_export.delay(job_id=job.id, job_user=job.user.id, no_children=False) - - except Exception as err: # pylint: disable=broad-except - logger.exception("User Export Job %s Failed with error: %s", job.id, err) - job.set_status("failed") - - -@app.task(queue=IMPORTS, base=ParentTask) -def export_saved_lists_task(**kwargs): - """add user saved lists to export JSON""" - - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) - saved_lists = List.objects.filter(id__in=job.user.saved_lists.all()).distinct() - job.export_json["saved_lists"] = [l.remote_id for l in saved_lists] - job.save(update_fields=["export_json"]) - - -@app.task(queue=IMPORTS, base=ParentTask) -def export_follows_task(**kwargs): - """add user follows to export JSON""" - - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) - follows = UserFollows.objects.filter(user_subject=job.user).distinct() - following = User.objects.filter(userfollows_user_object__in=follows).distinct() - job.export_json["follows"] = [f.remote_id for f in following] - job.save(update_fields=["export_json"]) - - -@app.task(queue=IMPORTS, base=ParentTask) -def export_blocks_task(**kwargs): - """add user blocks to export JSON""" - - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) - blocks = UserBlocks.objects.filter(user_subject=job.user).distinct() - blocking = User.objects.filter(userblocks_user_object__in=blocks).distinct() - job.export_json["blocks"] = [b.remote_id for b in blocking] - job.save(update_fields=["export_json"]) - - -@app.task(queue=IMPORTS, base=ParentTask) -def export_reading_goals_task(**kwargs): - """add user reading goals to export JSON""" - - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) - reading_goals = AnnualGoal.objects.filter(user=job.user).distinct() - job.export_json["goals"] = [] - for goal in reading_goals: - job.export_json["goals"].append( - {"goal": goal.goal, "year": goal.year, "privacy": goal.privacy} - ) - job.save(update_fields=["export_json"]) - - -@app.task(queue=IMPORTS, base=ParentTask) -def json_export(**kwargs): - """Generate an export for a user""" try: - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) job.set_status("active") - job_id = kwargs["job_id"] - if not job.export_json.get("icon"): - job.export_json["icon"] = {} - else: - job.export_json["icon"]["url"] = url2relativepath( - job.export_json["icon"]["url"] - ) - - # Additional settings - can't be serialized as AP - vals = [ - "show_goal", - "preferred_timezone", - "default_post_privacy", - "show_suggested_users", - ] - job.export_json["settings"] = {} - for k in vals: - job.export_json["settings"][k] = getattr(job.user, k) - - job.export_json["books"] = [] - - # save settings we just updated + # generate JSON structure + job.export_json = export_json(job.user) job.save(update_fields=["export_json"]) - # trigger subtasks - export_saved_lists_task.delay(job_id=job_id, no_children=False) - export_follows_task.delay(job_id=job_id, no_children=False) - export_blocks_task.delay(job_id=job_id, no_children=False) - trigger_books_jobs.delay(job_id=job_id, no_children=False) - + # create archive in separate task + create_archive_task.delay(job_id=job.id) except Exception as err: # pylint: disable=broad-except logger.exception( - "json_export task in job %s Failed with error: %s", - job.id, - err, + "create_export_json_task for %s failed with error: %s", job, err ) job.set_status("failed") -@app.task(queue=IMPORTS, base=ParentTask) -def trigger_books_jobs(**kwargs): - """trigger tasks to get data for each book""" +@app.task(queue=IMPORTS) +def create_archive_task(job_id): + """create the archive containing the JSON file and additional files""" + + job = BookwyrmExportJob.objects.get(id=job_id) + + # don't start the job if it was stopped from the UI + if job.complete: + return try: - job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) - editions = get_books_for_user(job.user) + export_task_id = job.task_id + export_json_bytes = DjangoJSONEncoder().encode(job.export_json).encode("utf-8") - if len(editions) == 0: - job.notify_child_job_complete() - return + user = job.user + editions = get_books_for_user(user) - for edition in editions: - try: - edition_job = AddBookToUserExportJob.objects.create( - edition=edition, parent_job=job - ) - edition_job.start_job() - except Exception as err: # pylint: disable=broad-except - logger.exception( - "AddBookToUserExportJob %s Failed with error: %s", - edition_job.id, - err, - ) - edition_job.set_status("failed") + if settings.USE_S3: + # Connection for writing temporary files + storage = S3Boto3Storage() + + # Handle for creating the final archive + s3_archive_path = f"exports/{export_task_id}.tar.gz" + s3_tar = S3Tar( + settings.AWS_STORAGE_BUCKET_NAME, + s3_archive_path, + session=BookwyrmAwsSession(), + ) + + # Save JSON file to a temporary location + export_json_tmp_file = f"exports/{export_task_id}/archive.json" + S3Boto3Storage.save( + storage, + export_json_tmp_file, + ContentFile(export_json_bytes), + ) + s3_tar.add_file(export_json_tmp_file) + + # Add avatar image if present + if user.avatar: + s3_tar.add_file(f"images/{user.avatar.name}") + + for edition in editions: + if edition.cover: + s3_tar.add_file(f"images/{edition.cover.name}") + + # Create archive and store file name + s3_tar.tar() + job.export_data = s3_archive_path + job.save(update_fields=["export_data"]) + + # Delete temporary files + S3Boto3Storage.delete(storage, export_json_tmp_file) + + else: + job.export_data = f"{export_task_id}.tar.gz" + with job.export_data.open("wb") as tar_file: + with BookwyrmTarFile.open(mode="w:gz", fileobj=tar_file) as tar: + # save json file + tar.write_bytes(export_json_bytes) + + # Add avatar image if present + if user.avatar: + tar.add_image(user.avatar, directory="images/") + + for edition in editions: + if edition.cover: + tar.add_image(edition.cover, directory="images/") + job.save(update_fields=["export_data"]) + + job.set_status("completed") except Exception as err: # pylint: disable=broad-except - logger.exception("trigger_books_jobs %s Failed with error: %s", job.id, err) + logger.exception("create_archive_task for %s failed with error: %s", job, err) job.set_status("failed") +def export_json(user: User): + """create export JSON""" + data = export_user(user) # in the root of the JSON structure + data["settings"] = export_settings(user) + data["goals"] = export_goals(user) + data["books"] = export_books(user) + data["saved_lists"] = export_saved_lists(user) + data["follows"] = export_follows(user) + data["blocks"] = export_blocks(user) + return data + + +def export_user(user: User): + """export user data""" + data = user.to_activity() + data["icon"]["url"] = ( + url2relativepath(data["icon"]["url"]) if data.get("icon", False) else {} + ) + return data + + +def export_settings(user: User): + """Additional settings - can't be serialized as AP""" + vals = [ + "show_goal", + "preferred_timezone", + "default_post_privacy", + "show_suggested_users", + ] + return {k: getattr(user, k) for k in vals} + + +def export_saved_lists(user: User): + """add user saved lists to export JSON""" + return [l.remote_id for l in user.saved_lists.all()] + + +def export_follows(user: User): + """add user follows to export JSON""" + follows = UserFollows.objects.filter(user_subject=user).distinct() + following = User.objects.filter(userfollows_user_object__in=follows).distinct() + return [f.remote_id for f in following] + + +def export_blocks(user: User): + """add user blocks to export JSON""" + blocks = UserBlocks.objects.filter(user_subject=user).distinct() + blocking = User.objects.filter(userblocks_user_object__in=blocks).distinct() + return [b.remote_id for b in blocking] + + +def export_goals(user: User): + """add user reading goals to export JSON""" + reading_goals = AnnualGoal.objects.filter(user=user).distinct() + return [ + {"goal": goal.goal, "year": goal.year, "privacy": goal.privacy} + for goal in reading_goals + ] + + +def export_books(user: User): + """add books to export JSON""" + editions = get_books_for_user(user) + return [export_book(user, edition) for edition in editions] + + +def export_book(user: User, edition: Edition): + """add book to export JSON""" + data = {} + data["work"] = edition.parent_work.to_activity() + data["edition"] = edition.to_activity() + + if data["edition"].get("cover"): + data["edition"]["cover"]["url"] = url2relativepath( + data["edition"]["cover"]["url"] + ) + + # authors + data["authors"] = [author.to_activity() for author in edition.authors.all()] + + # Shelves this book is on + # Every ShelfItem is this book so we don't other serializing + shelf_books = ( + ShelfBook.objects.select_related("shelf") + .filter(user=user, book=edition) + .distinct() + ) + data["shelves"] = [shelfbook.shelf.to_activity() for shelfbook in shelf_books] + + # Lists and ListItems + # ListItems include "notes" and "approved" so we need them + # even though we know it's this book + list_items = ListItem.objects.filter(book=edition, user=user).distinct() + + data["lists"] = [] + for item in list_items: + list_info = item.book_list.to_activity() + list_info[ + "privacy" + ] = item.book_list.privacy # this isn't serialized so we add it + list_info["list_item"] = item.to_activity() + data["lists"].append(list_info) + + # Statuses + # Can't use select_subclasses here because + # we need to filter on the "book" value, + # which is not available on an ordinary Status + for status in ["comments", "quotations", "reviews"]: + data[status] = [] + + comments = Comment.objects.filter(user=user, book=edition).all() + for status in comments: + obj = status.to_activity() + obj["progress"] = status.progress + obj["progress_mode"] = status.progress_mode + data["comments"].append(obj) + + quotes = Quotation.objects.filter(user=user, book=edition).all() + for status in quotes: + obj = status.to_activity() + obj["position"] = status.position + obj["endposition"] = status.endposition + obj["position_mode"] = status.position_mode + data["quotations"].append(obj) + + reviews = Review.objects.filter(user=user, book=edition).all() + data["reviews"] = [status.to_activity() for status in reviews] + + # readthroughs can't be serialized to activity + book_readthroughs = ( + ReadThrough.objects.filter(user=user, book=edition).distinct().values() + ) + data["readthroughs"] = list(book_readthroughs) + return data + + def get_books_for_user(user): """Get all the books and editions related to a user""" From 9afd0ebb54d67f5cc1ed4f7d894479e713e44470 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 27 Mar 2024 20:15:06 +0100 Subject: [PATCH 166/200] Update migrations --- .../migrations/0200_auto_20240327_1914.py | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 bookwyrm/migrations/0200_auto_20240327_1914.py diff --git a/bookwyrm/migrations/0200_auto_20240327_1914.py b/bookwyrm/migrations/0200_auto_20240327_1914.py new file mode 100644 index 000000000..44d84a13e --- /dev/null +++ b/bookwyrm/migrations/0200_auto_20240327_1914.py @@ -0,0 +1,27 @@ +# Generated by Django 3.2.25 on 2024-03-27 19:14 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0199_merge_20240326_1217'), + ] + + operations = [ + migrations.RemoveField( + model_name='addfiletotar', + name='childjob_ptr', + ), + migrations.RemoveField( + model_name='addfiletotar', + name='parent_export_job', + ), + migrations.DeleteModel( + name='AddBookToUserExportJob', + ), + migrations.DeleteModel( + name='AddFileToTar', + ), + ] From 797d5cb508555283dd7807883866cb8bc5eb6508 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 27 Mar 2024 20:39:57 +0100 Subject: [PATCH 167/200] Update BookwyrmExportJob tests --- bookwyrm/models/bookwyrm_export_job.py | 9 ++- .../tests/models/test_bookwyrm_export_job.py | 76 ++----------------- 2 files changed, 11 insertions(+), 74 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 8c3eeb41f..7a0c1100c 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -179,9 +179,10 @@ def export_json(user: User): def export_user(user: User): """export user data""" data = user.to_activity() - data["icon"]["url"] = ( - url2relativepath(data["icon"]["url"]) if data.get("icon", False) else {} - ) + if data.get("icon", False): + data["icon"]["url"] = url2relativepath(data["icon"]["url"]) + else: + data["icon"] = {} return data @@ -236,7 +237,7 @@ def export_book(user: User, edition: Edition): data["work"] = edition.parent_work.to_activity() data["edition"] = edition.to_activity() - if data["edition"].get("cover"): + if data["edition"].get("cover", False): data["edition"]["cover"]["url"] = url2relativepath( data["edition"]["cover"]["url"] ) diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index 1e0f6a39f..654ecec9e 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -153,25 +153,15 @@ class BookwyrmExportJob(TestCase): book=self.edition, ) - self.job = models.BookwyrmExportJob.objects.create( - user=self.local_user, export_json={} - ) + self.job = models.BookwyrmExportJob.objects.create(user=self.local_user) + + # run the first stage of the export + with patch("bookwyrm.models.bookwyrm_export_job.create_archive_task.delay"): + models.bookwyrm_export_job.create_export_json_task(job_id=self.job.id) + self.job.refresh_from_db() def test_add_book_to_user_export_job(self): """does AddBookToUserExportJob ...add the book to the export?""" - - self.job.export_json["books"] = [] - self.job.save() - - with patch("bookwyrm.models.bookwyrm_export_job.AddFileToTar.start_job"): - model = models.bookwyrm_export_job - edition_job = model.AddBookToUserExportJob.objects.create( - edition=self.edition, parent_job=self.job - ) - - edition_job.start_job() - - self.job.refresh_from_db() self.assertIsNotNone(self.job.export_json["books"]) self.assertEqual(len(self.job.export_json["books"]), 1) book = self.job.export_json["books"][0] @@ -192,27 +182,12 @@ class BookwyrmExportJob(TestCase): def test_start_export_task(self): """test saved list task saves initial json and data""" - - with patch("bookwyrm.models.bookwyrm_export_job.json_export.delay"): - models.bookwyrm_export_job.start_export_task( - job_id=self.job.id, no_children=False - ) - - self.job.refresh_from_db() - self.assertIsNotNone(self.job.export_data) self.assertIsNotNone(self.job.export_json) self.assertEqual(self.job.export_json["name"], self.local_user.name) def test_export_saved_lists_task(self): """test export_saved_lists_task adds the saved lists""" - - models.bookwyrm_export_job.export_saved_lists_task( - job_id=self.job.id, no_children=False - ) - - self.job.refresh_from_db() - self.assertIsNotNone(self.job.export_json["saved_lists"]) self.assertEqual( self.job.export_json["saved_lists"][0], self.saved_list.remote_id @@ -220,60 +195,21 @@ class BookwyrmExportJob(TestCase): def test_export_follows_task(self): """test export_follows_task adds the follows""" - - models.bookwyrm_export_job.export_follows_task( - job_id=self.job.id, no_children=False - ) - - self.job.refresh_from_db() - self.assertIsNotNone(self.job.export_json["follows"]) self.assertEqual(self.job.export_json["follows"][0], self.rat_user.remote_id) def test_export_blocks_task(self): - """test export_blocks_task adds the blocks""" - - models.bookwyrm_export_job.export_blocks_task( - job_id=self.job.id, no_children=False - ) - - self.job.refresh_from_db() - self.assertIsNotNone(self.job.export_json["blocks"]) self.assertEqual(self.job.export_json["blocks"][0], self.badger_user.remote_id) def test_export_reading_goals_task(self): """test export_reading_goals_task adds the goals""" - - models.bookwyrm_export_job.export_reading_goals_task( - job_id=self.job.id, no_children=False - ) - - self.job.refresh_from_db() - self.assertIsNotNone(self.job.export_json["goals"]) self.assertEqual(self.job.export_json["goals"][0]["goal"], 128937123) def test_json_export(self): """test json_export job adds settings""" - - with patch( - "bookwyrm.models.bookwyrm_export_job.export_saved_lists_task.delay" - ), patch( - "bookwyrm.models.bookwyrm_export_job.export_follows_task.delay" - ), patch( - "bookwyrm.models.bookwyrm_export_job.export_blocks_task.delay" - ), patch( - "bookwyrm.models.bookwyrm_export_job.trigger_books_jobs.delay" - ): - - models.bookwyrm_export_job.json_export( - job_id=self.job.id, no_children=False - ) - - self.job.refresh_from_db() - self.assertIsNotNone(self.job.export_json["settings"]) self.assertFalse(self.job.export_json["settings"]["show_goal"]) self.assertEqual( From c6ca547d58c1c0bd1d2f378495507a068eba66ea Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 27 Mar 2024 20:41:59 +0100 Subject: [PATCH 168/200] Fix migration formatting --- bookwyrm/migrations/0200_auto_20240327_1914.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bookwyrm/migrations/0200_auto_20240327_1914.py b/bookwyrm/migrations/0200_auto_20240327_1914.py index 44d84a13e..38180b3f9 100644 --- a/bookwyrm/migrations/0200_auto_20240327_1914.py +++ b/bookwyrm/migrations/0200_auto_20240327_1914.py @@ -6,22 +6,22 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0199_merge_20240326_1217'), + ("bookwyrm", "0199_merge_20240326_1217"), ] operations = [ migrations.RemoveField( - model_name='addfiletotar', - name='childjob_ptr', + model_name="addfiletotar", + name="childjob_ptr", ), migrations.RemoveField( - model_name='addfiletotar', - name='parent_export_job', + model_name="addfiletotar", + name="parent_export_job", ), migrations.DeleteModel( - name='AddBookToUserExportJob', + name="AddBookToUserExportJob", ), migrations.DeleteModel( - name='AddFileToTar', + name="AddFileToTar", ), ] From cdbc1d172c00c30a4579c98bd38d51e0690330c9 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 27 Mar 2024 23:27:19 +0100 Subject: [PATCH 169/200] Fix double exports subdir in S3 user export --- bookwyrm/models/bookwyrm_export_job.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 7a0c1100c..35226c6a4 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -99,6 +99,7 @@ def create_archive_task(job_id): try: export_task_id = job.task_id + archive_filename = f"{export_task_id}.tar.gz" export_json_bytes = DjangoJSONEncoder().encode(job.export_json).encode("utf-8") user = job.user @@ -109,10 +110,9 @@ def create_archive_task(job_id): storage = S3Boto3Storage() # Handle for creating the final archive - s3_archive_path = f"exports/{export_task_id}.tar.gz" s3_tar = S3Tar( settings.AWS_STORAGE_BUCKET_NAME, - s3_archive_path, + f"exports/{archive_filename}", session=BookwyrmAwsSession(), ) @@ -135,14 +135,14 @@ def create_archive_task(job_id): # Create archive and store file name s3_tar.tar() - job.export_data = s3_archive_path + job.export_data = archive_filename job.save(update_fields=["export_data"]) # Delete temporary files S3Boto3Storage.delete(storage, export_json_tmp_file) else: - job.export_data = f"{export_task_id}.tar.gz" + job.export_data = archive_filename with job.export_data.open("wb") as tar_file: with BookwyrmTarFile.open(mode="w:gz", fileobj=tar_file) as tar: # save json file From dabf7c6e10084181765cc1356e8b099d29ee0742 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 28 Mar 2024 13:09:21 +0100 Subject: [PATCH 170/200] User export testing fixes --- bookwyrm/models/bookwyrm_export_job.py | 74 ++++++++++++++++---------- bookwyrm/utils/tar.py | 15 +++--- 2 files changed, 53 insertions(+), 36 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 35226c6a4..09f064ea2 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -1,11 +1,10 @@ """Export user account to tar.gz file for import into another Bookwyrm instance""" import logging -from urllib.parse import urlparse, unquote +import os from boto3.session import Session as BotoSession from s3_tar import S3Tar -from storages.backends.s3boto3 import S3Boto3Storage from django.db.models import BooleanField, FileField, JSONField from django.db.models import Q @@ -13,7 +12,7 @@ from django.core.serializers.json import DjangoJSONEncoder from django.core.files.base import ContentFile from django.utils.module_loading import import_string -from bookwyrm import settings +from bookwyrm import settings, storage_backends from bookwyrm.models import AnnualGoal, ReadThrough, ShelfBook, ListItem from bookwyrm.models import Review, Comment, Quotation @@ -55,12 +54,6 @@ class BookwyrmExportJob(ParentJob): self.save(update_fields=["task_id"]) -def url2relativepath(url: str) -> str: - """turn an absolute URL into a relative filesystem path""" - parsed = urlparse(url) - return unquote(parsed.path[1:]) - - @app.task(queue=IMPORTS) def create_export_json_task(job_id): """create the JSON data for the export""" @@ -87,6 +80,22 @@ def create_export_json_task(job_id): job.set_status("failed") +def archive_file_location(file, directory="") -> str: + """get the relative location of a file inside the archive""" + return os.path.join(directory, file.name) + + +def add_file_to_s3_tar(s3_tar: S3Tar, storage, file, directory=""): + """ + add file to S3Tar inside directory, keeping any directories under its + storage location + """ + s3_tar.add_file( + os.path.join(storage.location, file.name), + folder=os.path.dirname(archive_file_location(file, directory=directory)), + ) + + @app.task(queue=IMPORTS) def create_archive_task(job_id): """create the archive containing the JSON file and additional files""" @@ -98,7 +107,7 @@ def create_archive_task(job_id): return try: - export_task_id = job.task_id + export_task_id = str(job.task_id) archive_filename = f"{export_task_id}.tar.gz" export_json_bytes = DjangoJSONEncoder().encode(job.export_json).encode("utf-8") @@ -106,32 +115,39 @@ def create_archive_task(job_id): editions = get_books_for_user(user) if settings.USE_S3: - # Connection for writing temporary files - storage = S3Boto3Storage() + # Storage for writing temporary files + exports_storage = storage_backends.ExportsS3Storage() # Handle for creating the final archive s3_tar = S3Tar( - settings.AWS_STORAGE_BUCKET_NAME, - f"exports/{archive_filename}", + exports_storage.bucket_name, + os.path.join(exports_storage.location, archive_filename), session=BookwyrmAwsSession(), ) # Save JSON file to a temporary location - export_json_tmp_file = f"exports/{export_task_id}/archive.json" - S3Boto3Storage.save( - storage, + export_json_tmp_file = os.path.join(export_task_id, "archive.json") + exports_storage.save( export_json_tmp_file, ContentFile(export_json_bytes), ) - s3_tar.add_file(export_json_tmp_file) + s3_tar.add_file( + os.path.join(exports_storage.location, export_json_tmp_file) + ) + + # Add images to TAR + images_storage = storage_backends.ImagesStorage() - # Add avatar image if present if user.avatar: - s3_tar.add_file(f"images/{user.avatar.name}") + add_file_to_s3_tar( + s3_tar, images_storage, user.avatar, directory="images" + ) for edition in editions: if edition.cover: - s3_tar.add_file(f"images/{edition.cover.name}") + add_file_to_s3_tar( + s3_tar, images_storage, edition.cover, directory="images" + ) # Create archive and store file name s3_tar.tar() @@ -139,7 +155,7 @@ def create_archive_task(job_id): job.save(update_fields=["export_data"]) # Delete temporary files - S3Boto3Storage.delete(storage, export_json_tmp_file) + exports_storage.delete(export_json_tmp_file) else: job.export_data = archive_filename @@ -150,11 +166,11 @@ def create_archive_task(job_id): # Add avatar image if present if user.avatar: - tar.add_image(user.avatar, directory="images/") + tar.add_image(user.avatar, directory="images") for edition in editions: if edition.cover: - tar.add_image(edition.cover, directory="images/") + tar.add_image(edition.cover, directory="images") job.save(update_fields=["export_data"]) job.set_status("completed") @@ -179,8 +195,8 @@ def export_json(user: User): def export_user(user: User): """export user data""" data = user.to_activity() - if data.get("icon", False): - data["icon"]["url"] = url2relativepath(data["icon"]["url"]) + if user.avatar: + data["icon"]["url"] = archive_file_location(user.avatar, directory="images") else: data["icon"] = {} return data @@ -237,9 +253,9 @@ def export_book(user: User, edition: Edition): data["work"] = edition.parent_work.to_activity() data["edition"] = edition.to_activity() - if data["edition"].get("cover", False): - data["edition"]["cover"]["url"] = url2relativepath( - data["edition"]["cover"]["url"] + if edition.cover: + data["edition"]["cover"]["url"] = archive_file_location( + edition.cover, directory="images" ) # authors diff --git a/bookwyrm/utils/tar.py b/bookwyrm/utils/tar.py index bae3f7628..6b78b1a99 100644 --- a/bookwyrm/utils/tar.py +++ b/bookwyrm/utils/tar.py @@ -1,5 +1,6 @@ """manage tar files for user exports""" import io +import os import tarfile from typing import Any, Optional from uuid import uuid4 @@ -24,13 +25,13 @@ class BookwyrmTarFile(tarfile.TarFile): :param str filename: overrides the file name set by image :param str directory: the directory in the archive to put the image """ - if filename is not None: - file_type = image.name.rsplit(".", maxsplit=1)[-1] - filename = f"{directory}{filename}.{file_type}" + if filename is None: + filename = image.name else: - filename = f"{directory}{image.name}" + filename += os.path.splitext(image.name)[1] + path = os.path.join(directory, filename) - info = tarfile.TarInfo(name=filename) + info = tarfile.TarInfo(name=path) info.size = image.size self.addfile(info, fileobj=image) @@ -43,7 +44,7 @@ class BookwyrmTarFile(tarfile.TarFile): def write_image_to_file(self, filename: str, file_field: Any) -> None: """add an image to the tar""" - extension = filename.rsplit(".")[-1] + extension = os.path.splitext(filename)[1] if buf := self.extractfile(filename): - filename = f"{str(uuid4())}.{extension}" + filename = str(uuid4()) + extension file_field.save(filename, File(buf)) From bb5d8152f154e5d600ef381bd07a73423addd258 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 28 Mar 2024 13:21:30 +0100 Subject: [PATCH 171/200] Fix mypy error --- bookwyrm/utils/tar.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/utils/tar.py b/bookwyrm/utils/tar.py index 6b78b1a99..70fdc38f1 100644 --- a/bookwyrm/utils/tar.py +++ b/bookwyrm/utils/tar.py @@ -18,7 +18,7 @@ class BookwyrmTarFile(tarfile.TarFile): self.addfile(info, fileobj=buffer) def add_image( - self, image: Any, filename: Optional[str] = None, directory: Any = "" + self, image: Any, filename: Optional[str] = None, directory: str = "" ) -> None: """ Add an image to the tar archive @@ -26,12 +26,12 @@ class BookwyrmTarFile(tarfile.TarFile): :param str directory: the directory in the archive to put the image """ if filename is None: - filename = image.name + dst_filename = image.name else: - filename += os.path.splitext(image.name)[1] - path = os.path.join(directory, filename) + dst_filename = filename + os.path.splitext(image.name)[1] + dst_path = os.path.join(directory, dst_filename) - info = tarfile.TarInfo(name=path) + info = tarfile.TarInfo(name=dst_path) info.size = image.size self.addfile(info, fileobj=image) From 2bbe3d4c325ef7ace4353940a12b676da07a2f2f Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 28 Mar 2024 13:50:55 +0100 Subject: [PATCH 172/200] Test user export archive contents --- .../tests/models/test_bookwyrm_export_job.py | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index 654ecec9e..46c9bff56 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -1,17 +1,15 @@ """test bookwyrm user export functions""" import datetime -from io import BytesIO +import json import pathlib from unittest.mock import patch -from PIL import Image - -from django.core.files.base import ContentFile from django.utils import timezone from django.test import TestCase from bookwyrm import models +from bookwyrm.utils.tar import BookwyrmTarFile class BookwyrmExportJob(TestCase): @@ -47,6 +45,11 @@ class BookwyrmExportJob(TestCase): preferred_timezone="America/Los Angeles", default_post_privacy="followers", ) + avatar_path = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + with open(avatar_path, "rb") as avatar_file: + self.local_user.avatar.save("mouse-avatar.jpg", avatar_file) self.rat_user = models.User.objects.create_user( "rat", "rat@rat.rat", "ratword", local=True, localname="rat" @@ -93,13 +96,11 @@ class BookwyrmExportJob(TestCase): ) # edition cover - image_file = pathlib.Path(__file__).parent.joinpath( + cover_path = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - self.edition.cover.save("tèst.jpg", ContentFile(output.getvalue())) + with open(cover_path, "rb") as cover_file: + self.edition.cover.save("tèst.jpg", cover_file) self.edition.authors.add(self.author) @@ -228,3 +229,28 @@ class BookwyrmExportJob(TestCase): self.assertEqual(len(data), 1) self.assertEqual(data[0].title, "Example Edition") + + def test_archive(self): + """actually create the TAR file""" + models.bookwyrm_export_job.create_archive_task(job_id=self.job.id) + self.job.refresh_from_db() + + with self.job.export_data.open("rb") as tar_file: + with BookwyrmTarFile.open(mode="r", fileobj=tar_file) as tar: + archive_json_file = tar.extractfile("archive.json") + data = json.load(archive_json_file) + + # JSON from the archive should be what we want it to be + self.assertEqual(data, self.job.export_json) + + # User avatar should be present in archive + with self.local_user.avatar.open() as expected_avatar: + archive_avatar = tar.extractfile(data["icon"]["url"]) + self.assertEqual(expected_avatar.read(), archive_avatar.read()) + + # Edition cover should be present in archive + with self.edition.cover.open() as expected_cover: + archive_cover = tar.extractfile( + data["books"][0]["edition"]["cover"]["url"] + ) + self.assertEqual(expected_cover.read(), archive_cover.read()) From 2272e7a326c751f55d4c37150fee8b346218e501 Mon Sep 17 00:00:00 2001 From: Anthony Date: Fri, 29 Mar 2024 12:07:52 +0100 Subject: [PATCH 173/200] flower 2.0.1 fixes a few link bugs (particularly for favicon) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6b3d838bf..81975fc4d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ django-sass-processor==1.2.2 django-storages==1.13.2 django-storages[azure] environs==9.5.0 -flower==2.0.0 +flower==2.0.1 grpcio==1.57.0 # Not a direct dependency, pinned to get a security fix libsass==0.22.0 Markdown==3.4.1 From 5d597f1ca96659418f9fc4e68a81773cad7e0517 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 29 Mar 2024 14:25:08 +0100 Subject: [PATCH 174/200] Use new "with ()" style --- .../tests/models/test_bookwyrm_export_job.py | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index a02cfe052..29a2a07c1 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -233,22 +233,24 @@ class BookwyrmExportJob(TestCase): models.bookwyrm_export_job.create_archive_task(job_id=self.job.id) self.job.refresh_from_db() - with self.job.export_data.open("rb") as tar_file: - with BookwyrmTarFile.open(mode="r", fileobj=tar_file) as tar: - archive_json_file = tar.extractfile("archive.json") - data = json.load(archive_json_file) + with ( + self.job.export_data.open("rb") as tar_file, + BookwyrmTarFile.open(mode="r", fileobj=tar_file) as tar, + ): + archive_json_file = tar.extractfile("archive.json") + data = json.load(archive_json_file) - # JSON from the archive should be what we want it to be - self.assertEqual(data, self.job.export_json) + # JSON from the archive should be what we want it to be + self.assertEqual(data, self.job.export_json) - # User avatar should be present in archive - with self.local_user.avatar.open() as expected_avatar: - archive_avatar = tar.extractfile(data["icon"]["url"]) - self.assertEqual(expected_avatar.read(), archive_avatar.read()) + # User avatar should be present in archive + with self.local_user.avatar.open() as expected_avatar: + archive_avatar = tar.extractfile(data["icon"]["url"]) + self.assertEqual(expected_avatar.read(), archive_avatar.read()) - # Edition cover should be present in archive - with self.edition.cover.open() as expected_cover: - archive_cover = tar.extractfile( - data["books"][0]["edition"]["cover"]["url"] - ) - self.assertEqual(expected_cover.read(), archive_cover.read()) + # Edition cover should be present in archive + with self.edition.cover.open() as expected_cover: + archive_cover = tar.extractfile( + data["books"][0]["edition"]["cover"]["url"] + ) + self.assertEqual(expected_cover.read(), archive_cover.read()) From 75bc4f8cb0d62acbdafe33d4a56d724da9909393 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 29 Mar 2024 15:04:38 +0100 Subject: [PATCH 175/200] Make nginx config safer Instead of allowing all image files anywhere, and disallowing non-image file under /images/, only allow image files under /images/ and don't match non-image files elsewhere. They get proxied to web instead and result in a 404 there. For example, the old config allowed /exports/foo.jpg to be served, while the new config does not. --- nginx/development | 19 +++++++++---------- nginx/production | 21 ++++++++++----------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/nginx/development b/nginx/development index 2c3a1d02f..f7443968c 100644 --- a/nginx/development +++ b/nginx/development @@ -64,7 +64,7 @@ server { # directly serve static files from the # bookwyrm filesystem using sendfile. # make the logs quieter by not reporting these requests - location ~ ^/static/ { + location /static/ { root /app; try_files $uri =404; add_header X-Cache-Status STATIC; @@ -72,15 +72,14 @@ server { } # same with image files not in static folder - location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|webp)$ { - root /app; - try_files $uri =404; - add_header X-Cache-Status STATIC; - access_log off; - } - - # block access to any non-image files from images - location ~ ^/images/ { + location /images/ { + location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|webp)$ { + root /app; + try_files $uri =404; + add_header X-Cache-Status STATIC; + access_log off; + } + # block access to any non-image files from images return 403; } diff --git a/nginx/production b/nginx/production index 841ed8afa..a5e910b4b 100644 --- a/nginx/production +++ b/nginx/production @@ -96,23 +96,22 @@ server { # # directly serve static files from the # # bookwyrm filesystem using sendfile. # # make the logs quieter by not reporting these requests -# location ~ ^/static/ { +# location /static/ { # root /app; # try_files $uri =404; # add_header X-Cache-Status STATIC; # access_log off; # } - +# # # same with image files not in static folder -# location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|webp)$ { -# root /app; -# try_files $uri =404; -# add_header X-Cache-Status STATIC; -# access_log off; -# } - -# # block access to any non-image files from images -# location ~ ^/images/ { +# location /images/ { +# location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|webp)$ { +# root /app; +# try_files $uri =404; +# add_header X-Cache-Status STATIC; +# access_log off; +# } +# # block access to any non-image files from images # return 403; # } # From ffee29d8e2d5c8c430520ac666b5083c75b16499 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 29 Mar 2024 15:45:35 +0100 Subject: [PATCH 176/200] Fix resource leaks Rewrite places where files (or other resources) are opened but not closed to "with" blocks, which automatically call close() at the end of the scope. Also simplify some tests where images need to be saved to a model field: an opened file can be passed directly to FileField.save(). --- bookwyrm/preview_images.py | 48 +++++++++--------- bookwyrm/settings.py | 1 - .../tests/activitypub/test_base_activity.py | 10 ++-- .../tests/importers/test_calibre_import.py | 6 ++- .../tests/importers/test_goodreads_import.py | 6 ++- bookwyrm/tests/importers/test_importer.py | 6 ++- .../importers/test_librarything_import.py | 6 ++- .../importers/test_openlibrary_import.py | 6 ++- .../tests/importers/test_storygraph_import.py | 6 ++- bookwyrm/tests/models/test_book_model.py | 11 ++--- bookwyrm/tests/models/test_fields.py | 49 +++++++------------ bookwyrm/tests/models/test_status_model.py | 15 +++--- bookwyrm/tests/test_preview_images.py | 17 ++++--- bookwyrm/tests/views/admin/test_federation.py | 8 +-- bookwyrm/tests/views/books/test_book.py | 30 +++++------- bookwyrm/tests/views/imports/test_import.py | 14 +++--- .../tests/views/imports/test_user_import.py | 14 +++--- .../tests/views/preferences/test_edit_user.py | 20 ++++---- bookwyrm/tests/views/test_feed.py | 11 ++--- 19 files changed, 135 insertions(+), 149 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 995f25bfd..a213490ab 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -175,11 +175,13 @@ def generate_instance_layer(content_width): site = models.SiteSettings.objects.get() if site.logo_small: - logo_img = Image.open(site.logo_small) + with Image.open(site.logo_small) as logo_img: + logo_img.load() else: try: static_path = os.path.join(settings.STATIC_ROOT, "images/logo-small.png") - logo_img = Image.open(static_path) + with Image.open(static_path) as logo_img: + logo_img.load() except FileNotFoundError: logo_img = None @@ -211,18 +213,9 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): """Places components for rating preview""" - try: - icon_star_full = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") - ) - icon_star_empty = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") - ) - icon_star_half = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") - ) - except FileNotFoundError: - return None + path_star_full = os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") + path_star_empty = os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") + path_star_half = os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") icon_size = 64 icon_margin = 10 @@ -237,17 +230,23 @@ def generate_rating_layer(rating, content_width): position_x = 0 - for _ in range(math.floor(rating)): - rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + try: + with Image.open(path_star_full) as icon_star_full: + for _ in range(math.floor(rating)): + rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - if math.floor(rating) != math.ceil(rating): - rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + if math.floor(rating) != math.ceil(rating): + with Image.open(path_star_half) as icon_star_half: + rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - for _ in range(5 - math.ceil(rating)): - rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + with Image.open(path_star_empty) as icon_star_empty: + for _ in range(5 - math.ceil(rating)): + rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) + position_x = position_x + icon_size + icon_margin + except FileNotFoundError: + return None rating_layer_mask = rating_layer_mask.getchannel("A") rating_layer_mask = ImageOps.invert(rating_layer_mask) @@ -290,7 +289,8 @@ def generate_preview_image( texts = texts or {} # Cover try: - inner_img_layer = Image.open(picture) + with Image.open(picture) as inner_img_layer: + inner_img_layer.load() inner_img_layer.thumbnail( (inner_img_width, inner_img_height), Image.Resampling.LANCZOS ) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 77bec0d8e..28d78a3da 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -19,7 +19,6 @@ DOMAIN = env("DOMAIN") with open("VERSION", encoding="utf-8") as f: version = f.read() version = version.replace("\n", "") -f.close() VERSION = version diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index b529f6ae5..a545beb3e 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -1,12 +1,10 @@ """ tests the base functionality for activitypub dataclasses """ -from io import BytesIO import json import pathlib from unittest.mock import patch from dataclasses import dataclass from django.test import TestCase -from PIL import Image import responses from bookwyrm import activitypub @@ -48,13 +46,11 @@ class BaseActivity(TestCase): # don't try to load the user icon del self.userdata["icon"] - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = 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() + with open(image_path, "rb") as image_file: + self.image_data = image_file.read() def test_get_representative_not_existing(self, *_): """test that an instance representative actor is created if it does not exist""" diff --git a/bookwyrm/tests/importers/test_calibre_import.py b/bookwyrm/tests/importers/test_calibre_import.py index dcbe68c64..d7947e65e 100644 --- a/bookwyrm/tests/importers/test_calibre_import.py +++ b/bookwyrm/tests/importers/test_calibre_import.py @@ -9,7 +9,6 @@ from bookwyrm.importers import CalibreImporter from bookwyrm.models.import_job import handle_imported_book -# pylint: disable=consider-using-with @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") @@ -20,8 +19,13 @@ class CalibreImport(TestCase): """use a test csv""" self.importer = CalibreImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/calibre.csv") + # pylint: disable-next=consider-using-with self.csv = open(datafile, "r", encoding=self.importer.encoding) + def tearDown(self): + """close test csv""" + self.csv.close() + @classmethod def setUpTestData(cls): """populate database""" diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index f0b67cffd..79d58085c 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -16,7 +16,6 @@ def make_date(*args): return datetime.datetime(*args, tzinfo=pytz.UTC) -# pylint: disable=consider-using-with @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") @@ -27,8 +26,13 @@ class GoodreadsImport(TestCase): """use a test csv""" self.importer = GoodreadsImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") + # pylint: disable-next=consider-using-with self.csv = open(datafile, "r", encoding=self.importer.encoding) + def tearDown(self): + """close test csv""" + self.csv.close() + @classmethod def setUpTestData(cls): """populate database""" diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index ea10d0f53..39aac22ff 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -19,7 +19,6 @@ def make_date(*args): return datetime.datetime(*args, tzinfo=pytz.UTC) -# pylint: disable=consider-using-with @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") @@ -30,8 +29,13 @@ class GenericImporter(TestCase): """use a test csv""" self.importer = Importer() datafile = pathlib.Path(__file__).parent.joinpath("../data/generic.csv") + # pylint: disable-next=consider-using-with self.csv = open(datafile, "r", encoding=self.importer.encoding) + def tearDown(self): + """close test csv""" + self.csv.close() + @classmethod def setUpTestData(cls): """populate database""" diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 280131115..4d78d242a 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -16,7 +16,6 @@ def make_date(*args): return datetime.datetime(*args, tzinfo=pytz.UTC) -# pylint: disable=consider-using-with @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") @@ -29,8 +28,13 @@ class LibrarythingImport(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv") # Librarything generates latin encoded exports... + # pylint: disable-next=consider-using-with self.csv = open(datafile, "r", encoding=self.importer.encoding) + def tearDown(self): + """close test csv""" + self.csv.close() + @classmethod def setUpTestData(cls): """populate database""" diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index 05bab0cc2..8f2f120ff 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -16,7 +16,6 @@ def make_date(*args): return datetime.datetime(*args, tzinfo=pytz.UTC) -# pylint: disable=consider-using-with @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") @@ -27,8 +26,13 @@ class OpenLibraryImport(TestCase): """use a test csv""" self.importer = OpenLibraryImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/openlibrary.csv") + # pylint: disable-next=consider-using-with self.csv = open(datafile, "r", encoding=self.importer.encoding) + def tearDown(self): + """close test csv""" + self.csv.close() + @classmethod def setUpTestData(cls): """populate database""" diff --git a/bookwyrm/tests/importers/test_storygraph_import.py b/bookwyrm/tests/importers/test_storygraph_import.py index eee27010c..3de2b13a0 100644 --- a/bookwyrm/tests/importers/test_storygraph_import.py +++ b/bookwyrm/tests/importers/test_storygraph_import.py @@ -16,7 +16,6 @@ def make_date(*args): return datetime.datetime(*args, tzinfo=pytz.UTC) -# pylint: disable=consider-using-with @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") @@ -27,8 +26,13 @@ class StorygraphImport(TestCase): """use a test csv""" self.importer = StorygraphImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/storygraph.csv") + # pylint: disable-next=consider-using-with self.csv = open(datafile, "r", encoding=self.importer.encoding) + def tearDown(self): + """close test csv""" + self.csv.close() + @classmethod def setUpTestData(cls): """populate database""" diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index c40c94294..5b2b71ba9 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -1,12 +1,9 @@ """ testing models """ -from io import BytesIO import pathlib import pytest from dateutil.parser import parse -from PIL import Image -from django.core.files.base import ContentFile from django.test import TestCase from django.utils import timezone @@ -130,15 +127,13 @@ class Book(TestCase): ) def test_thumbnail_fields(self): """Just hit them""" - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) book = models.Edition.objects.create(title="hello") - book.cover.save("test.jpg", ContentFile(output.getvalue())) + with open(image_path, "rb") as image_file: + book.cover.save("test.jpg", image_file) self.assertIsNotNone(book.cover_bw_book_xsmall_webp.url) self.assertIsNotNone(book.cover_bw_book_xsmall_jpg.url) diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index cc8c54113..2917c8908 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -1,5 +1,4 @@ """ testing models """ -from io import BytesIO from collections import namedtuple from dataclasses import dataclass import datetime @@ -10,7 +9,6 @@ from typing import List from unittest import expectedFailure from unittest.mock import patch -from PIL import Image import responses from django.core.exceptions import ValidationError @@ -420,13 +418,11 @@ class ModelFields(TestCase): user = User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = 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())) + with open(image_path, "rb") as image_file: + user.avatar.save("test.jpg", image_file) instance = fields.ImageField() @@ -516,30 +512,25 @@ class ModelFields(TestCase): @responses.activate def test_image_field_set_field_from_activity_no_overwrite_with_cover(self, *_): """update a model instance from an activitypub object""" - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - - another_image_file = pathlib.Path(__file__).parent.joinpath( + another_image_path = pathlib.Path(__file__).parent.joinpath( "../../static/images/logo.png" ) - another_image = Image.open(another_image_file) - another_output = BytesIO() - another_image.save(another_output, format=another_image.format) instance = fields.ImageField(activitypub_field="cover", name="cover") - responses.add( - responses.GET, - "http://www.example.com/image.jpg", - body=another_image.tobytes(), - status=200, - ) + with open(another_image_path, "rb") as another_image_file: + responses.add( + responses.GET, + "http://www.example.com/image.jpg", + body=another_image_file.read(), + status=200, + ) book = Edition.objects.create(title="hello") - book.cover.save("test.jpg", ContentFile(output.getvalue())) + with open(image_path, "rb") as image_file: + book.cover.save("test.jpg", image_file) cover_size = book.cover.size self.assertIsNotNone(cover_size) @@ -553,24 +544,22 @@ class ModelFields(TestCase): @responses.activate def test_image_field_set_field_from_activity_with_overwrite_with_cover(self, *_): """update a model instance from an activitypub object""" - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) book = Edition.objects.create(title="hello") - book.cover.save("test.jpg", ContentFile(output.getvalue())) + with open(image_path, "rb") as image_file: + book.cover.save("test.jpg", image_file) cover_size = book.cover.size self.assertIsNotNone(cover_size) - another_image_file = pathlib.Path(__file__).parent.joinpath( + another_image_path = pathlib.Path(__file__).parent.joinpath( "../../static/images/logo.png" ) instance = fields.ImageField(activitypub_field="cover", name="cover") - with open(another_image_file, "rb") as another_image: + with open(another_image_path, "rb") as another_image: responses.add( responses.GET, "http://www.example.com/image.jpg", diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index bd2853595..e97febbfa 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -1,16 +1,13 @@ """ testing models """ from unittest.mock import patch -from io import BytesIO import pathlib import re from django.http import Http404 -from django.core.files.base import ContentFile from django.db import IntegrityError from django.contrib.auth.models import AnonymousUser from django.test import TestCase from django.utils import timezone -from PIL import Image import responses from bookwyrm import activitypub, models, settings @@ -51,14 +48,14 @@ class Status(TestCase): """individual test setup""" self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = 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())) + with ( + patch("bookwyrm.models.Status.broadcast"), + open(image_path, "rb") as image_file, + ): + self.book.cover.save("test.jpg", image_file) def test_status_generated_fields(self, *_): """setting remote id""" diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 4f711b38b..12fb56d07 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -21,20 +21,20 @@ from bookwyrm.preview_images import ( # pylint: disable=unused-argument # pylint: disable=missing-function-docstring -# pylint: disable=consider-using-with class PreviewImages(TestCase): """every response to a get request, html or json""" def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - avatar_file = pathlib.Path(__file__).parent.joinpath( + avatar_path = pathlib.Path(__file__).parent.joinpath( "../static/images/no_cover.jpg" ) with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), + open(avatar_path, "rb") as avatar_file, ): self.local_user = models.User.objects.create_user( "possum@local.com", @@ -43,8 +43,8 @@ class PreviewImages(TestCase): local=True, localname="possum", avatar=SimpleUploadedFile( - avatar_file, - open(avatar_file, "rb").read(), + avatar_path, + avatar_file.read(), content_type="image/jpeg", ), ) @@ -68,6 +68,7 @@ class PreviewImages(TestCase): patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), + open(avatar_path, "rb") as avatar_file, ): self.remote_user_with_preview = models.User.objects.create_user( "badger@your.domain.here", @@ -78,8 +79,8 @@ class PreviewImages(TestCase): inbox="https://example.com/users/badger/inbox", outbox="https://example.com/users/badger/outbox", avatar=SimpleUploadedFile( - avatar_file, - open(avatar_file, "rb").read(), + avatar_path, + avatar_file.read(), content_type="image/jpeg", ), ) @@ -96,7 +97,7 @@ class PreviewImages(TestCase): settings.ENABLE_PREVIEW_IMAGES = True def test_generate_preview_image(self, *args, **kwargs): - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../static/images/no_cover.jpg" ) @@ -105,7 +106,7 @@ class PreviewImages(TestCase): "text_three": "@possum@local.com", } - result = generate_preview_image(texts=texts, picture=image_file, rating=5) + result = generate_preview_image(texts=texts, picture=image_path, rating=5) self.assertIsInstance(result, Image.Image) self.assertEqual( result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) diff --git a/bookwyrm/tests/views/admin/test_federation.py b/bookwyrm/tests/views/admin/test_federation.py index 1d0012dde..6dcd5535f 100644 --- a/bookwyrm/tests/views/admin/test_federation.py +++ b/bookwyrm/tests/views/admin/test_federation.py @@ -1,5 +1,4 @@ """ test for app action functionality """ -import os import json from unittest.mock import patch @@ -179,7 +178,6 @@ class FederationViews(TestCase): self.assertEqual(server.application_type, "coolsoft") self.assertEqual(server.status, "blocked") - # pylint: disable=consider-using-with def test_import_blocklist(self): """load a json file with a list of servers to block""" server = models.FederatedServer.objects.create(server_name="hi.there.com") @@ -191,14 +189,13 @@ class FederationViews(TestCase): {"instance": "hi.there.com", "url": "https://explanation.url"}, # existing {"a": "b"}, # invalid ] - json.dump(data, open("file.json", "w")) # pylint: disable=unspecified-encoding view = views.ImportServerBlocklist.as_view() request = self.factory.post( "", { "json_file": SimpleUploadedFile( - "file.json", open("file.json", "rb").read() + "file.json", json.dumps(data).encode("utf-8") ) }, ) @@ -214,6 +211,3 @@ class FederationViews(TestCase): created = models.FederatedServer.objects.get(server_name="server.name") self.assertEqual(created.status, "blocked") self.assertEqual(created.notes, "https://explanation.url") - - # remove file.json after test - os.remove("file.json") diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index cb66811a1..ee6e7d8b4 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -1,8 +1,6 @@ """ test for app action functionality """ -from io import BytesIO import pathlib from unittest.mock import patch -from PIL import Image import responses @@ -161,15 +159,15 @@ class BookViews(TestCase): def test_upload_cover_file(self): """add a cover via file upload""" self.assertFalse(self.book.cover) - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../../static/images/default_avi.jpg" ) form = forms.CoverForm(instance=self.book) - # pylint: disable=consider-using-with - form.data["cover"] = SimpleUploadedFile( - image_file, open(image_file, "rb").read(), content_type="image/jpeg" - ) + with open(image_path, "rb") as image_file: + form.data["cover"] = SimpleUploadedFile( + image_path, image_file.read(), content_type="image/jpeg" + ) request = self.factory.post("", form.data) request.user = self.local_user @@ -296,16 +294,14 @@ class BookViews(TestCase): def _setup_cover_url(): """creates cover url mock""" cover_url = "http://example.com" - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - responses.add( - responses.GET, - cover_url, - body=output.getvalue(), - status=200, - ) + with open(image_path, "rb") as image_file: + responses.add( + responses.GET, + cover_url, + body=image_file.read(), + status=200, + ) return cover_url diff --git a/bookwyrm/tests/views/imports/test_import.py b/bookwyrm/tests/views/imports/test_import.py index 658d95a33..f694b7bf5 100644 --- a/bookwyrm/tests/views/imports/test_import.py +++ b/bookwyrm/tests/views/imports/test_import.py @@ -81,13 +81,13 @@ class ImportViews(TestCase): form.data["source"] = "Goodreads" form.data["privacy"] = "public" form.data["include_reviews"] = False - csv_file = pathlib.Path(__file__).parent.joinpath("../../data/goodreads.csv") - form.data["csv_file"] = SimpleUploadedFile( - # pylint: disable=consider-using-with - csv_file, - open(csv_file, "rb").read(), - content_type="text/csv", - ) + csv_path = pathlib.Path(__file__).parent.joinpath("../../data/goodreads.csv") + with open(csv_path, "rb") as csv_file: + form.data["csv_file"] = SimpleUploadedFile( + csv_path, + csv_file.read(), + content_type="text/csv", + ) request = self.factory.post("", form.data) request.user = self.local_user diff --git a/bookwyrm/tests/views/imports/test_user_import.py b/bookwyrm/tests/views/imports/test_user_import.py index 4a676a57f..a8214e74e 100644 --- a/bookwyrm/tests/views/imports/test_user_import.py +++ b/bookwyrm/tests/views/imports/test_user_import.py @@ -47,16 +47,16 @@ class ImportUserViews(TestCase): view = views.UserImport.as_view() form = forms.ImportUserForm() - archive_file = pathlib.Path(__file__).parent.joinpath( + archive_path = pathlib.Path(__file__).parent.joinpath( "../../data/bookwyrm_account_export.tar.gz" ) - form.data["archive_file"] = SimpleUploadedFile( - # pylint: disable=consider-using-with - archive_file, - open(archive_file, "rb").read(), - content_type="application/gzip", - ) + with open(archive_path, "rb") as archive_file: + form.data["archive_file"] = SimpleUploadedFile( + archive_path, + archive_file.read(), + content_type="application/gzip", + ) form.data["include_user_settings"] = "" form.data["include_goals"] = "on" diff --git a/bookwyrm/tests/views/preferences/test_edit_user.py b/bookwyrm/tests/views/preferences/test_edit_user.py index 7872e8f6e..c31c8237e 100644 --- a/bookwyrm/tests/views/preferences/test_edit_user.py +++ b/bookwyrm/tests/views/preferences/test_edit_user.py @@ -96,13 +96,13 @@ class EditUserViews(TestCase): form.data["email"] = "wow@email.com" form.data["default_post_privacy"] = "public" form.data["preferred_timezone"] = "UTC" - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../../static/images/no_cover.jpg" ) - # pylint: disable=consider-using-with - form.data["avatar"] = SimpleUploadedFile( - image_file, open(image_file, "rb").read(), content_type="image/jpeg" - ) + with open(image_path, "rb") as image_file: + form.data["avatar"] = SimpleUploadedFile( + image_path, image_file.read(), content_type="image/jpeg" + ) request = self.factory.post("", form.data) request.user = self.local_user @@ -119,12 +119,12 @@ class EditUserViews(TestCase): def test_crop_avatar(self, _): """reduce that image size""" - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../../static/images/no_cover.jpg" ) - image = Image.open(image_file) - result = views.preferences.edit_user.crop_avatar(image) + with Image.open(image_path) as image: + result = views.preferences.edit_user.crop_avatar(image) self.assertIsInstance(result, ContentFile) - image_result = Image.open(result) - self.assertEqual(image_result.size, (120, 120)) + with Image.open(result) as image_result: + self.assertEqual(image_result.size, (120, 120)) diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index a57be1023..be4956c64 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -1,10 +1,7 @@ """ test for app action functionality """ -from io import BytesIO from unittest.mock import patch import pathlib -from PIL import Image -from django.core.files.base import ContentFile from django.http import Http404 from django.template.response import TemplateResponse from django.test import TestCase @@ -142,12 +139,9 @@ class FeedViews(TestCase): """there are so many views, this just makes sure it LOADS""" view = views.Status.as_view() - image_file = pathlib.Path(__file__).parent.joinpath( + image_path = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): status = models.Review.objects.create( content="hi", @@ -157,7 +151,8 @@ class FeedViews(TestCase): attachment = models.Image.objects.create( status=status, caption="alt text here" ) - attachment.image.save("test.jpg", ContentFile(output.getvalue())) + with open(image_path, "rb") as image_file: + attachment.image.save("test.jpg", image_file) request = self.factory.get("") request.user = self.local_user From fcd0087589d5467eceba4b9fce75e9f52fa9e90d Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Sat, 30 Mar 2024 01:58:41 +0100 Subject: [PATCH 177/200] [FIX] make sure to get Pillow>=10 compatible pilkit --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 81975fc4d..5bb33ae0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,6 +27,7 @@ opentelemetry-instrumentation-django==0.37b0 opentelemetry-instrumentation-psycopg2==0.37b0 opentelemetry-sdk==1.16.0 Pillow==10.2.0 +pilkit>2.0 # dependency of django-imagekit, 2.0 is incompatible with Pillow>=10 protobuf==3.20.* psycopg2==2.9.5 pycryptodome==3.19.1 From f66695193497adc5b8d864b346c8a013ce359732 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Sat, 30 Mar 2024 21:56:41 +0100 Subject: [PATCH 178/200] Update CodeQL workflows to v3 https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/ --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 51316ef62..014745a52 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,7 +40,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -51,7 +51,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -65,4 +65,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From 4bbdd0b2d0f4e97e3f9e50aadff437b11276e1a9 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Tue, 2 Apr 2024 21:54:30 +0200 Subject: [PATCH 179/200] Add index on Status.remote_id This field is often used in WHERE-clauses in queries that are very slow on bookwyrm.social. --- ...9_status_bookwyrm_st_remote__06aeba_idx.py | 19 +++++++++++++++++++ bookwyrm/models/status.py | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 bookwyrm/migrations/0199_status_bookwyrm_st_remote__06aeba_idx.py diff --git a/bookwyrm/migrations/0199_status_bookwyrm_st_remote__06aeba_idx.py b/bookwyrm/migrations/0199_status_bookwyrm_st_remote__06aeba_idx.py new file mode 100644 index 000000000..5d2513698 --- /dev/null +++ b/bookwyrm/migrations/0199_status_bookwyrm_st_remote__06aeba_idx.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.25 on 2024-04-02 19:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0198_book_search_vector_author_aliases"), + ] + + operations = [ + migrations.AddIndex( + model_name="status", + index=models.Index( + fields=["remote_id"], name="bookwyrm_st_remote__06aeba_idx" + ), + ), + ] diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index f6235dab6..a9c678cb5 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -80,6 +80,9 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): """default sorting""" ordering = ("-published_date",) + indexes = [ + models.Index(fields=["remote_id"]), + ] def save(self, *args, **kwargs): """save and notify""" From ea0ade955b83c9e0f3d29b0948ffa5699611cc63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:45:11 +0000 Subject: [PATCH 180/200] Bump pillow from 10.2.0 to 10.3.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/10.2.0...10.3.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 81975fc4d..218035926 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,7 +26,7 @@ opentelemetry-instrumentation-celery==0.37b0 opentelemetry-instrumentation-django==0.37b0 opentelemetry-instrumentation-psycopg2==0.37b0 opentelemetry-sdk==1.16.0 -Pillow==10.2.0 +Pillow==10.3.0 protobuf==3.20.* psycopg2==2.9.5 pycryptodome==3.19.1 From 5cfe7eca6f3c177cc436812e45dfb03288b5fbc2 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 3 Apr 2024 21:06:24 +0200 Subject: [PATCH 181/200] Add index for finding all statuses in a thread --- ...0_status_bookwyrm_st_thread__cf064f_idx.py | 19 +++++++++++++++++++ bookwyrm/models/status.py | 1 + 2 files changed, 20 insertions(+) create mode 100644 bookwyrm/migrations/0200_status_bookwyrm_st_thread__cf064f_idx.py diff --git a/bookwyrm/migrations/0200_status_bookwyrm_st_thread__cf064f_idx.py b/bookwyrm/migrations/0200_status_bookwyrm_st_thread__cf064f_idx.py new file mode 100644 index 000000000..daca654c7 --- /dev/null +++ b/bookwyrm/migrations/0200_status_bookwyrm_st_thread__cf064f_idx.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.25 on 2024-04-03 19:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0199_status_bookwyrm_st_remote__06aeba_idx"), + ] + + operations = [ + migrations.AddIndex( + model_name="status", + index=models.Index( + fields=["thread_id"], name="bookwyrm_st_thread__cf064f_idx" + ), + ), + ] diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index a9c678cb5..546a8d6c8 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -82,6 +82,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): ordering = ("-published_date",) indexes = [ models.Index(fields=["remote_id"]), + models.Index(fields=["thread_id"]), ] def save(self, *args, **kwargs): From 4d5a30d9533cec6f137cf25b85fad9415e122cfe Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 3 Apr 2024 21:11:27 +0200 Subject: [PATCH 182/200] Add index for looking up KeyPair by remote id --- ..._keypair_bookwyrm_ke_remote__472927_idx.py | 19 +++++++++++++++++++ bookwyrm/models/user.py | 7 +++++++ 2 files changed, 26 insertions(+) create mode 100644 bookwyrm/migrations/0201_keypair_bookwyrm_ke_remote__472927_idx.py diff --git a/bookwyrm/migrations/0201_keypair_bookwyrm_ke_remote__472927_idx.py b/bookwyrm/migrations/0201_keypair_bookwyrm_ke_remote__472927_idx.py new file mode 100644 index 000000000..e3d27a11b --- /dev/null +++ b/bookwyrm/migrations/0201_keypair_bookwyrm_ke_remote__472927_idx.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.25 on 2024-04-03 19:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0200_status_bookwyrm_st_thread__cf064f_idx"), + ] + + operations = [ + migrations.AddIndex( + model_name="keypair", + index=models.Index( + fields=["remote_id"], name="bookwyrm_ke_remote__472927_idx" + ), + ), + ] diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 89fd39b73..e24143e8e 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -509,6 +509,13 @@ class KeyPair(ActivitypubMixin, BookWyrmModel): activity_serializer = activitypub.PublicKey serialize_reverse_fields = [("owner", "owner", "id")] + class Meta: + """indexes""" + + indexes = [ + models.Index(fields=["remote_id"]), + ] + def get_remote_id(self): # self.owner is set by the OneToOneField on User return f"{self.owner.remote_id}/#main-key" From 0501ce39cdd22a57b484b48f987dc342bbedf9e6 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 3 Apr 2024 21:15:24 +0200 Subject: [PATCH 183/200] Add index for looking up User by username --- ...202_user_bookwyrm_us_usernam_b2546d_idx.py | 19 +++++++++++++++++++ bookwyrm/models/user.py | 7 +++++++ 2 files changed, 26 insertions(+) create mode 100644 bookwyrm/migrations/0202_user_bookwyrm_us_usernam_b2546d_idx.py diff --git a/bookwyrm/migrations/0202_user_bookwyrm_us_usernam_b2546d_idx.py b/bookwyrm/migrations/0202_user_bookwyrm_us_usernam_b2546d_idx.py new file mode 100644 index 000000000..d8666fe3f --- /dev/null +++ b/bookwyrm/migrations/0202_user_bookwyrm_us_usernam_b2546d_idx.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.25 on 2024-04-03 19:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0201_keypair_bookwyrm_ke_remote__472927_idx"), + ] + + operations = [ + migrations.AddIndex( + model_name="user", + index=models.Index( + fields=["username"], name="bookwyrm_us_usernam_b2546d_idx" + ), + ), + ] diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index e24143e8e..8c1b79e45 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -198,6 +198,13 @@ class User(OrderedCollectionPageMixin, AbstractUser): hotp_secret = models.CharField(max_length=32, default=None, blank=True, null=True) hotp_count = models.IntegerField(default=0, blank=True, null=True) + class Meta(AbstractUser.Meta): + """indexes""" + + indexes = [ + models.Index(fields=["username"]), + ] + @property def active_follower_requests(self): """Follow requests from active users""" From 464a0298c6de25780020201ee2f397939d443cd3 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 3 Apr 2024 21:23:24 +0200 Subject: [PATCH 184/200] Add index for finding active (and local) users --- ...203_user_bookwyrm_us_is_acti_972dc4_idx.py | 19 +++++++++++++++++++ bookwyrm/models/user.py | 1 + 2 files changed, 20 insertions(+) create mode 100644 bookwyrm/migrations/0203_user_bookwyrm_us_is_acti_972dc4_idx.py diff --git a/bookwyrm/migrations/0203_user_bookwyrm_us_is_acti_972dc4_idx.py b/bookwyrm/migrations/0203_user_bookwyrm_us_is_acti_972dc4_idx.py new file mode 100644 index 000000000..b07f1c8a9 --- /dev/null +++ b/bookwyrm/migrations/0203_user_bookwyrm_us_is_acti_972dc4_idx.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.25 on 2024-04-03 19:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0202_user_bookwyrm_us_usernam_b2546d_idx"), + ] + + operations = [ + migrations.AddIndex( + model_name="user", + index=models.Index( + fields=["is_active", "local"], name="bookwyrm_us_is_acti_972dc4_idx" + ), + ), + ] diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 8c1b79e45..0ec2c6529 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -203,6 +203,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): indexes = [ models.Index(fields=["username"]), + models.Index(fields=["is_active", "local"]), ] @property From 321397a349cc9f22e9b976e6edb249896460b78e Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 3 Apr 2024 21:27:40 +0200 Subject: [PATCH 185/200] Specify which column DISTINCT should apply to --- bookwyrm/activitystreams.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 42f99e209..5030005d7 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -139,14 +139,14 @@ class ActivityStream(RedisStore): | ( Q(following=status.user) & Q(following=status.reply_parent.user) ) # if the user is following both authors - ).distinct() + ) # only visible to the poster's followers and tagged users elif status.privacy == "followers": audience = audience.filter( Q(following=status.user) # if the user is following the author ) - return audience.distinct() + return audience.distinct("id") @tracer.start_as_current_span("ActivityStream.get_audience") def get_audience(self, status): From 439cb3ccaaddec6fa110bb1dc81561fd1710bac4 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 4 Apr 2024 13:15:31 +0200 Subject: [PATCH 186/200] Remove unnecessary conversions between list and set --- bookwyrm/activitystreams.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 5030005d7..b8f4ed985 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -156,7 +156,7 @@ class ActivityStream(RedisStore): status_author = models.User.objects.filter( is_active=True, local=True, id=status.user.id ).values_list("id", flat=True) - return list(set(list(audience) + list(status_author))) + return list(set(audience) | set(status_author)) def get_stores_for_users(self, user_ids): """convert a list of user ids into redis store ids""" @@ -191,7 +191,7 @@ class HomeStream(ActivityStream): status_author = models.User.objects.filter( is_active=True, local=True, id=status.user.id ).values_list("id", flat=True) - return list(set(list(audience) + list(status_author))) + return list(set(audience) | set(status_author)) def get_statuses_for_user(self, user): return models.Status.privacy_filter( From e1c54b2933bbfab278a2d49a5716911903f4385e Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 4 Apr 2024 13:47:51 +0200 Subject: [PATCH 187/200] Remove optimizations with adverse effects `if not audience` actually causes the entire query to be evaluated, before .values_list() is called. --- bookwyrm/activitystreams.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index b8f4ed985..0009ac7a3 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -183,8 +183,6 @@ class HomeStream(ActivityStream): def get_audience(self, status): trace.get_current_span().set_attribute("stream_id", self.key) audience = super()._get_audience(status) - if not audience: - return [] # if the user is following the author audience = audience.filter(following=status.user).values_list("id", flat=True) # if the user is the post's author @@ -239,9 +237,7 @@ class BooksStream(ActivityStream): ) audience = super()._get_audience(status) - if not audience: - return models.User.objects.none() - return audience.filter(shelfbook__book__parent_work=work).distinct() + return audience.filter(shelfbook__book__parent_work=work) def get_audience(self, status): # only show public statuses on the books feed, From af0bd90c15e6743cd267372d6533041c431282a7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Apr 2024 05:57:27 -0500 Subject: [PATCH 188/200] Adds merge migration --- bookwyrm/migrations/0204_merge_20240409_1042.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 bookwyrm/migrations/0204_merge_20240409_1042.py diff --git a/bookwyrm/migrations/0204_merge_20240409_1042.py b/bookwyrm/migrations/0204_merge_20240409_1042.py new file mode 100644 index 000000000..ba7513341 --- /dev/null +++ b/bookwyrm/migrations/0204_merge_20240409_1042.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.25 on 2024-04-09 10:42 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0197_mergedauthor_mergedbook'), + ('bookwyrm', '0203_user_bookwyrm_us_is_acti_972dc4_idx'), + ] + + operations = [ + ] From 3ffbb242a4f647f1317bb7892cf73965f3035ab0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Apr 2024 05:59:01 -0500 Subject: [PATCH 189/200] Black --- bookwyrm/migrations/0204_merge_20240409_1042.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bookwyrm/migrations/0204_merge_20240409_1042.py b/bookwyrm/migrations/0204_merge_20240409_1042.py index ba7513341..5656ac586 100644 --- a/bookwyrm/migrations/0204_merge_20240409_1042.py +++ b/bookwyrm/migrations/0204_merge_20240409_1042.py @@ -6,9 +6,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0197_mergedauthor_mergedbook'), - ('bookwyrm', '0203_user_bookwyrm_us_is_acti_972dc4_idx'), + ("bookwyrm", "0197_mergedauthor_mergedbook"), + ("bookwyrm", "0203_user_bookwyrm_us_is_acti_972dc4_idx"), ] - operations = [ - ] + operations = [] From 9d9e64399c5018ab47ee53c19951b7b1f37d88d9 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 10 Apr 2024 21:26:34 +0200 Subject: [PATCH 190/200] Install same version of eslint in CI as in dev-tools --- .github/workflows/lint-frontend.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-frontend.yaml b/.github/workflows/lint-frontend.yaml index 21f11ebf3..b0322f371 100644 --- a/.github/workflows/lint-frontend.yaml +++ b/.github/workflows/lint-frontend.yaml @@ -22,7 +22,8 @@ jobs: - uses: actions/checkout@v4 - name: Install modules - run: npm install stylelint stylelint-config-recommended stylelint-config-standard stylelint-order eslint + # run: npm install stylelint stylelint-config-recommended stylelint-config-standard stylelint-order eslint + run: npm install eslint@^8.9.0 # See .stylelintignore for files that are not linted. # - name: Run stylelint From d5a536ae367ae8197dae6c4e227377f09a36abc5 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Thu, 11 Apr 2024 14:45:13 +0200 Subject: [PATCH 191/200] Change pilkit constraint to the version that does work --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 957a2c4f7..df0ad6e13 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ opentelemetry-instrumentation-django==0.37b0 opentelemetry-instrumentation-psycopg2==0.37b0 opentelemetry-sdk==1.16.0 Pillow==10.3.0 -pilkit>2.0 # dependency of django-imagekit, 2.0 is incompatible with Pillow>=10 +pilkit>=3.0 # dependency of django-imagekit, 2.0 is incompatible with Pillow>=10 protobuf==3.20.* psycopg2==2.9.5 pycryptodome==3.19.1 From 501fb4552890c7336f45392047bb879c519b91c4 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 13 Apr 2024 12:03:35 +1000 Subject: [PATCH 192/200] export avatars to own directory Saving avatars to /images is problematic because it changes the original filepath from avatars/filename to images/avatars/filename. In this PR prior to this commit, imports failed as they are looking for a file path beginning with "avatar" --- bookwyrm/models/bookwyrm_export_job.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 09f064ea2..da79de6a8 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -139,9 +139,7 @@ def create_archive_task(job_id): images_storage = storage_backends.ImagesStorage() if user.avatar: - add_file_to_s3_tar( - s3_tar, images_storage, user.avatar, directory="images" - ) + add_file_to_s3_tar(s3_tar, images_storage, user.avatar) for edition in editions: if edition.cover: @@ -166,7 +164,7 @@ def create_archive_task(job_id): # Add avatar image if present if user.avatar: - tar.add_image(user.avatar, directory="images") + tar.add_image(user.avatar) for edition in editions: if edition.cover: @@ -196,7 +194,7 @@ def export_user(user: User): """export user data""" data = user.to_activity() if user.avatar: - data["icon"]["url"] = archive_file_location(user.avatar, directory="images") + data["icon"]["url"] = archive_file_location(user.avatar) else: data["icon"] = {} return data From c3c46144fe3aa61eefdb285d19d005705b95f6e6 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 13 Apr 2024 12:39:40 +1000 Subject: [PATCH 193/200] add merge migration --- bookwyrm/migrations/0205_merge_20240413_0232.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0205_merge_20240413_0232.py diff --git a/bookwyrm/migrations/0205_merge_20240413_0232.py b/bookwyrm/migrations/0205_merge_20240413_0232.py new file mode 100644 index 000000000..9cca29c45 --- /dev/null +++ b/bookwyrm/migrations/0205_merge_20240413_0232.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.25 on 2024-04-13 02:32 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0200_auto_20240327_1914"), + ("bookwyrm", "0204_merge_20240409_1042"), + ] + + operations = [] From f844abcad93f6754fd3c18c267656829f537c709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Mon, 8 Apr 2024 16:08:52 -0300 Subject: [PATCH 194/200] test_quotation_page_serialization: use strings for page numbers This follows from #3273, "Allow page numbers to be text, instead of integers". --- bookwyrm/tests/models/test_status_model.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index e97febbfa..b2ca63854 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -1,4 +1,5 @@ """ testing models """ +from unittest import expectedFailure from unittest.mock import patch import pathlib import re @@ -337,11 +338,14 @@ class Status(TestCase): activity["attachment"][0]["name"], "Author Name: Test Edition (worm)" ) + @expectedFailure def test_quotation_page_serialization(self, *_): """serialization of quotation page position""" tests = [ - ("single pos", 7, None, "p. 7"), - ("page range", 7, 10, "pp. 7-10"), + ("single pos", "7", "", "p. 7"), + ("page range", "7", "10", "pp. 7-10"), + ("page range roman", "xv", "xvi", "pp. xv-xvi"), + ("page range reverse", "14", "10", "pp. 14-10"), ] for desc, beg, end, pages in tests: with self.subTest(desc): From df78cc64a661a73e0e7cbafa9cac90d3d1f6b4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Mon, 8 Apr 2024 16:10:00 -0300 Subject: [PATCH 195/200] Quotation._format_position: do not treat page numbers as integers Fixes: #3352 --- bookwyrm/models/status.py | 2 +- bookwyrm/tests/models/test_status_model.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 546a8d6c8..dc0ab45a6 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -395,7 +395,7 @@ class Quotation(BookStatus): end = self.endposition or 0 if self.position_mode != "PG" or not beg: return None - return f"pp. {beg}-{end}" if end > beg else f"p. {beg}" + return f"pp. {beg}-{end}" if end else f"p. {beg}" @property def pure_content(self): diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index b2ca63854..5a7f0429b 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -1,5 +1,4 @@ """ testing models """ -from unittest import expectedFailure from unittest.mock import patch import pathlib import re @@ -338,7 +337,6 @@ class Status(TestCase): activity["attachment"][0]["name"], "Author Name: Test Edition (worm)" ) - @expectedFailure def test_quotation_page_serialization(self, *_): """serialization of quotation page position""" tests = [ From 873336960595a5d2da5157f4fac143e442a1b1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Mon, 8 Apr 2024 16:15:50 -0300 Subject: [PATCH 196/200] test_quotation_page_serialization: add test with no position --- bookwyrm/models/status.py | 2 +- bookwyrm/tests/models/test_status_model.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index dc0ab45a6..d0c1e639b 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -392,7 +392,7 @@ class Quotation(BookStatus): def _format_position(self) -> Optional[str]: """serialize page position""" beg = self.position - end = self.endposition or 0 + end = self.endposition if self.position_mode != "PG" or not beg: return None return f"pp. {beg}-{end}" if end else f"p. {beg}" diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 5a7f0429b..c266999a7 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -341,6 +341,7 @@ class Status(TestCase): """serialization of quotation page position""" tests = [ ("single pos", "7", "", "p. 7"), + ("missing beg", "", "10", None), ("page range", "7", "10", "pp. 7-10"), ("page range roman", "xv", "xvi", "pp. xv-xvi"), ("page range reverse", "14", "10", "pp. 14-10"), @@ -357,10 +358,11 @@ class Status(TestCase): position_mode="PG", ) activity = status.to_activity(pure=True) - self.assertRegex( - activity["content"], - f'^

    "my quote"

    — , {pages}

    $', - ) + if pages: + expect_re = f'^

    "my quote"

    — , {pages}

    $' + else: + expect_re = '^

    "my quote"

    —

    $' + self.assertRegex(activity["content"], expect_re) def test_review_to_activity(self, *_): """subclass of the base model version with a "pure" serializer""" From 4304cd4a791b9175e0d33a68350fc0ec95c48b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Tue, 9 Apr 2024 19:18:02 -0300 Subject: [PATCH 197/200] use re.escape --- bookwyrm/tests/models/test_status_model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index c266999a7..6323eeca3 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -359,7 +359,8 @@ class Status(TestCase): ) activity = status.to_activity(pure=True) if pages: - expect_re = f'^

    "my quote"

    — , {pages}

    $' + pages_re = re.escape(pages) + expect_re = f'^

    "my quote"

    — , {pages_re}

    $' else: expect_re = '^

    "my quote"

    —

    $' self.assertRegex(activity["content"], expect_re) From be872ed6724fd4b187eaa8b48a816cf86db59be8 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 27 Mar 2024 22:58:43 +0100 Subject: [PATCH 198/200] Support AWS_S3_URL_PROTOCOL - Allow setting in .env - Default to PROTOCOL (same as before) - Propagate to django-storages so it generates the correct URLs in sass_src --- .env.example | 1 + bookwyrm/settings.py | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index ee2ccd45a..c63d4fd4c 100644 --- a/.env.example +++ b/.env.example @@ -82,6 +82,7 @@ S3_SIGNED_URL_EXPIRY=900 # AWS_STORAGE_BUCKET_NAME= # "example-bucket-name" # AWS_S3_CUSTOM_DOMAIN=None # "example-bucket-name.s3.fr-par.scw.cloud" +# AWS_S3_URL_PROTOCOL=None # "http:" # AWS_S3_REGION_NAME=None # "fr-par" # AWS_S3_ENDPOINT_URL=None # "https://s3.fr-par.scw.cloud" diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 415d0ac34..27c86a22a 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -386,21 +386,32 @@ if USE_S3: AWS_S3_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL", None) AWS_DEFAULT_ACL = "public-read" AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"} + AWS_S3_URL_PROTOCOL = env("AWS_S3_URL_PROTOCOL", f"{PROTOCOL}:") # S3 Static settings STATIC_LOCATION = "static" - STATIC_URL = f"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/" + STATIC_URL = f"{AWS_S3_URL_PROTOCOL}//{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/" STATIC_FULL_URL = STATIC_URL STATICFILES_STORAGE = "bookwyrm.storage_backends.StaticStorage" # S3 Media settings MEDIA_LOCATION = "images" - MEDIA_URL = f"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_LOCATION}/" + MEDIA_URL = f"{AWS_S3_URL_PROTOCOL}//{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_LOCATION}/" MEDIA_FULL_URL = MEDIA_URL DEFAULT_FILE_STORAGE = "bookwyrm.storage_backends.ImagesStorage" # S3 Exports settings EXPORTS_STORAGE = "bookwyrm.storage_backends.ExportsS3Storage" # Content Security Policy - CSP_DEFAULT_SRC = ["'self'", AWS_S3_CUSTOM_DOMAIN] + CSP_ADDITIONAL_HOSTS - CSP_SCRIPT_SRC = ["'self'", AWS_S3_CUSTOM_DOMAIN] + CSP_ADDITIONAL_HOSTS + CSP_DEFAULT_SRC = [ + "'self'", + f"{AWS_S3_URL_PROTOCOL}//{AWS_S3_CUSTOM_DOMAIN}" + if AWS_S3_CUSTOM_DOMAIN + else None, + ] + CSP_ADDITIONAL_HOSTS + CSP_SCRIPT_SRC = [ + "'self'", + f"{AWS_S3_URL_PROTOCOL}//{AWS_S3_CUSTOM_DOMAIN}" + if AWS_S3_CUSTOM_DOMAIN + else None, + ] + CSP_ADDITIONAL_HOSTS elif USE_AZURE: # Azure settings AZURE_ACCOUNT_NAME = env("AZURE_ACCOUNT_NAME") From bf5c08dbf38e510d2af174af9a171a37f192bd4c Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 27 Mar 2024 23:00:42 +0100 Subject: [PATCH 199/200] Add docker-compose.override.yml to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 2d3393d3b..fd6cc7547 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ nginx/default.conf #macOS **/.DS_Store + +# Docker +docker-compose.override.yml From 031223104f35fe5e79dc9b71cdacaf4fcee1df22 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Wed, 24 Apr 2024 14:46:57 +0200 Subject: [PATCH 200/200] Clarify AWS_S3_URL_PROTOCOL in .env.example --- .env.example | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index c63d4fd4c..6a217df0c 100644 --- a/.env.example +++ b/.env.example @@ -78,7 +78,9 @@ S3_SIGNED_URL_EXPIRY=900 # 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 +# along with both AWS_S3_CUSTOM_DOMAIN and AWS_S3_ENDPOINT_URL. +# AWS_S3_URL_PROTOCOL must end in ":" and defaults to the same protocol as +# the BookWyrm instance ("http:" or "https:", based on USE_SSL). # AWS_STORAGE_BUCKET_NAME= # "example-bucket-name" # AWS_S3_CUSTOM_DOMAIN=None # "example-bucket-name.s3.fr-par.scw.cloud"