From c3ec25dbf80188211ec8720dd57753167c4b90b6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 28 Dec 2021 12:57:45 -0800 Subject: [PATCH 01/24] Simplifies query for earliest year --- bookwyrm/views/annual_summary.py | 42 ++++++-------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/bookwyrm/views/annual_summary.py b/bookwyrm/views/annual_summary.py index 07838d6e5..2ed27e718 100644 --- a/bookwyrm/views/annual_summary.py +++ b/bookwyrm/views/annual_summary.py @@ -3,7 +3,7 @@ from datetime import date from uuid import uuid4 from django.contrib.auth.decorators import login_required -from django.db.models import Case, When, Avg, Sum +from django.db.models import Avg, Sum, Min, Case, When from django.http import Http404 from django.shortcuts import redirect from django.template.response import TemplateResponse @@ -185,7 +185,12 @@ def privacy_verification(request, user, year, year_key): def is_year_available(user, year): """return boolean""" - earliest_year = int(get_earliest_year(user, year)) + earliest_year = user.readthrough_set.filter(finish_date__isnull=False).aggregate( + Min("finish_date") + )["finish_date__min"] + if not earliest_year: + return False + earliest_year = earliest_year.year today = date.today() year = int(year) if earliest_year <= year < today.year: @@ -196,39 +201,6 @@ def is_year_available(user, year): return False -def get_earliest_year(user, year): - """return the earliest finish_date or shelved_date year for user books in read shelf""" - - read_shelfbooks = models.ShelfBook.objects.filter(user__id=user.id).filter( - shelf__identifier__exact="read" - ) - read_shelfbooks_list = list(read_shelfbooks.values("book", "shelved_date")) - - book_dates = [] - - for book in read_shelfbooks_list: - earliest_finished = ( - models.ReadThrough.objects.filter(user__id=user.id) - .filter(book_id=book["book"]) - .exclude(finish_date__exact=None) - .order_by("finish_date") - .values("finish_date") - .first() - ) - - if earliest_finished: - book_dates.append( - min(earliest_finished["finish_date"], book["shelved_date"]) - ) - else: - book_dates.append(book["shelved_date"]) - - if book_dates: - return min(book_dates).year - - return year - - def get_books_from_shelfbooks(books_ids): """return an ordered QuerySet of books from a list""" From 6ca57ae314e982c73dd5a6697b0b5b5774f9548a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 09:43:06 -0800 Subject: [PATCH 02/24] Linter fixes --- bookwyrm/tests/views/test_annual_summary.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/views/test_annual_summary.py b/bookwyrm/tests/views/test_annual_summary.py index d62540288..0860d80f3 100644 --- a/bookwyrm/tests/views/test_annual_summary.py +++ b/bookwyrm/tests/views/test_annual_summary.py @@ -1,7 +1,7 @@ """testing the annual summary page""" from datetime import datetime -import pytz from unittest.mock import patch +import pytz from django.contrib.auth.models import AnonymousUser from django.http import Http404 @@ -124,7 +124,7 @@ class AnnualSummary(TestCase): def test_annual_summary_page_with_review(self, *_): """there are so many views, this just makes sure it LOADS""" - self.review = models.Review.objects.create( + models.Review.objects.create( name="Review name", content="test content", rating=3.0, From f9e9dc55d5c95840c3e0b2bd5c6ec2e754cdd7f6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 09:58:42 -0800 Subject: [PATCH 03/24] Updates tests --- bookwyrm/tests/views/test_annual_summary.py | 17 ++++++----------- bookwyrm/views/annual_summary.py | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/bookwyrm/tests/views/test_annual_summary.py b/bookwyrm/tests/views/test_annual_summary.py index 0860d80f3..c48ad3b09 100644 --- a/bookwyrm/tests/views/test_annual_summary.py +++ b/bookwyrm/tests/views/test_annual_summary.py @@ -100,13 +100,10 @@ class AnnualSummary(TestCase): @patch("bookwyrm.activitystreams.add_book_statuses_task.delay") def test_annual_summary_page(self, *_): """there are so many views, this just makes sure it LOADS""" - - shelf = self.local_user.shelf_set.filter(identifier="read").first() - models.ShelfBook.objects.create( - book=self.book, + models.ReadThrough.objects.create( user=self.local_user, - shelf=shelf, - shelved_date=make_date(2020, 1, 1), + book=self.book, + finish_date=make_date(2020, 1, 1) ) view = views.AnnualSummary.as_view() @@ -132,12 +129,10 @@ class AnnualSummary(TestCase): book=self.book, ) - shelf = self.local_user.shelf_set.filter(identifier="read").first() - models.ShelfBook.objects.create( - book=self.book, + models.ReadThrough.objects.create( user=self.local_user, - shelf=shelf, - shelved_date=make_date(2020, 1, 1), + book=self.book, + finish_date=make_date(2020, 1, 1) ) view = views.AnnualSummary.as_view() diff --git a/bookwyrm/views/annual_summary.py b/bookwyrm/views/annual_summary.py index 2ed27e718..00ca4210d 100644 --- a/bookwyrm/views/annual_summary.py +++ b/bookwyrm/views/annual_summary.py @@ -189,7 +189,7 @@ def is_year_available(user, year): Min("finish_date") )["finish_date__min"] if not earliest_year: - return False + return True earliest_year = earliest_year.year today = date.today() year = int(year) From 41fb44a46ad36a38c9e50b39b7db9634f07011cf Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 10:07:27 -0800 Subject: [PATCH 04/24] Python formatting --- bookwyrm/tests/views/test_annual_summary.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bookwyrm/tests/views/test_annual_summary.py b/bookwyrm/tests/views/test_annual_summary.py index c48ad3b09..32439eab2 100644 --- a/bookwyrm/tests/views/test_annual_summary.py +++ b/bookwyrm/tests/views/test_annual_summary.py @@ -101,9 +101,7 @@ class AnnualSummary(TestCase): def test_annual_summary_page(self, *_): """there are so many views, this just makes sure it LOADS""" models.ReadThrough.objects.create( - user=self.local_user, - book=self.book, - finish_date=make_date(2020, 1, 1) + user=self.local_user, book=self.book, finish_date=make_date(2020, 1, 1) ) view = views.AnnualSummary.as_view() @@ -130,9 +128,7 @@ class AnnualSummary(TestCase): ) models.ReadThrough.objects.create( - user=self.local_user, - book=self.book, - finish_date=make_date(2020, 1, 1) + user=self.local_user, book=self.book, finish_date=make_date(2020, 1, 1) ) view = views.AnnualSummary.as_view() From 9facaf404f6d18836f078822f106d8ea7bcfde81 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 10:20:54 -0800 Subject: [PATCH 05/24] Validates html in feed views --- bookwyrm/templates/feed/status.html | 2 +- bookwyrm/tests/views/test_feed.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html index 8dcad0886..e7b9280d7 100644 --- a/bookwyrm/templates/feed/status.html +++ b/bookwyrm/templates/feed/status.html @@ -31,7 +31,7 @@ {% endif %} {% endfor %} -
+
{% include 'snippets/status/status.html' with status=status main=True %}
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index 63264b800..475bebeb7 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -13,6 +13,7 @@ from django.test.client import RequestFactory from bookwyrm import models from bookwyrm import views from bookwyrm.activitypub import ActivitypubResponse +from bookwyrm.tests.validate_html import validate_html @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream") @@ -58,7 +59,7 @@ class FeedViews(TestCase): request.user = self.local_user result = view(request, "home") self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_status_page(self, *_): @@ -72,7 +73,7 @@ class FeedViews(TestCase): is_api.return_value = False result = view(request, "mouse", status.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) with patch("bookwyrm.views.feed.is_api_request") as is_api: @@ -139,7 +140,7 @@ class FeedViews(TestCase): is_api.return_value = False result = view(request, "mouse", status.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) with patch("bookwyrm.views.feed.is_api_request") as is_api: @@ -159,7 +160,7 @@ class FeedViews(TestCase): is_api.return_value = False result = view(request, "mouse", status.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) with patch("bookwyrm.views.feed.is_api_request") as is_api: @@ -175,7 +176,7 @@ class FeedViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_direct_messages_page_user(self, *_): @@ -185,7 +186,7 @@ class FeedViews(TestCase): request.user = self.local_user result = view(request, "nutria") self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) self.assertEqual(result.context_data["partner"], self.another_user) From 161532f8a8bb660b558a7c4b0a04473538cac006 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 10:37:21 -0800 Subject: [PATCH 06/24] Adds validate_html to announcement page tests --- bookwyrm/tests/views/admin/test_announcements.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bookwyrm/tests/views/admin/test_announcements.py b/bookwyrm/tests/views/admin/test_announcements.py index 44b5d5b67..fadd3d862 100644 --- a/bookwyrm/tests/views/admin/test_announcements.py +++ b/bookwyrm/tests/views/admin/test_announcements.py @@ -5,6 +5,7 @@ from django.test import TestCase from django.test.client import RequestFactory from bookwyrm import forms, models, views +from bookwyrm.tests.validate_html import validate_html class AnnouncementViews(TestCase): @@ -38,7 +39,7 @@ class AnnouncementViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_announcements_page_empty(self): @@ -51,7 +52,7 @@ class AnnouncementViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_announcement_page(self): @@ -68,7 +69,7 @@ class AnnouncementViews(TestCase): result = view(request, announcement.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_create_announcement(self): @@ -138,5 +139,5 @@ class AnnouncementViews(TestCase): result = view(request, self.local_user.localname) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) From 1e27b64af43b18fc89210b2b0f23d4af0ed86410 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 10:39:47 -0800 Subject: [PATCH 07/24] Valid dl html syntax on announcement page --- .../settings/announcements/announcement.html | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/bookwyrm/templates/settings/announcements/announcement.html b/bookwyrm/templates/settings/announcements/announcement.html index 37dba06fe..8b49f4f48 100644 --- a/bookwyrm/templates/settings/announcements/announcement.html +++ b/bookwyrm/templates/settings/announcements/announcement.html @@ -31,35 +31,29 @@
-
-
{% trans "Visible:" %}
-
- {% if announcement in active_announcements %} - {% trans "True" %} - {% else %} - {% trans "False" %} - {% endif %} -
-
+
{% trans "Visible:" %}
+
+ + {% if announcement in active_announcements %} + {% trans "True" %} + {% else %} + {% trans "False" %} + {% endif %} + +
{% if announcement.start_date %} -
-
{% trans "Start date:" %}
-
{{ announcement.start_date|naturalday }}
-
+
{% trans "Start date:" %}
+
{{ announcement.start_date|naturalday }}
{% endif %} {% if announcement.end_date %} -
-
{% trans "End date:" %}
-
{{ announcement.end_date|naturalday }}
-
+
{% trans "End date:" %}
+
{{ announcement.end_date|naturalday }}
{% endif %} -
-
{% trans "Active:" %}
-
{{ announcement.active }}
-
+
{% trans "Active:" %}
+
{{ announcement.active }}
From 3770713e0714e5df502bb19da6529c1cd0a1d8d0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 10:44:04 -0800 Subject: [PATCH 08/24] Validate html in discover page tests --- bookwyrm/tests/views/test_discover.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py index b2a82241f..dcfc2bf25 100644 --- a/bookwyrm/tests/views/test_discover.py +++ b/bookwyrm/tests/views/test_discover.py @@ -4,8 +4,8 @@ from django.contrib.auth.models import AnonymousUser from django.test import TestCase from django.test.client import RequestFactory -from bookwyrm import models -from bookwyrm import views +from bookwyrm import models, views +from bookwyrm.tests.validate_html import validate_html class DiscoverViews(TestCase): @@ -39,7 +39,7 @@ class DiscoverViews(TestCase): result = view(request) self.assertEqual(mock.call_count, 1) self.assertEqual(result.status_code, 200) - result.render() + validate_html(result.render()) @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") @patch("bookwyrm.activitystreams.add_status_task.delay") @@ -67,7 +67,7 @@ class DiscoverViews(TestCase): result = view(request) self.assertEqual(mock.call_count, 1) self.assertEqual(result.status_code, 200) - result.render() + validate_html(result.render()) def test_discover_page_logged_out(self): """there are so many views, this just makes sure it LOADS""" From 8e89d020934f69b91758aa68ca32cb9d4709697b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 11:10:11 -0800 Subject: [PATCH 09/24] Fixes html form for editing lists --- bookwyrm/templates/lists/curate.html | 4 +- bookwyrm/templates/lists/form.html | 81 ++++++++++++++++++++++------ bookwyrm/tests/views/test_list.py | 31 +++++------ 3 files changed, 83 insertions(+), 33 deletions(-) diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html index 638d86b88..13de89c16 100644 --- a/bookwyrm/templates/lists/curate.html +++ b/bookwyrm/templates/lists/curate.html @@ -54,13 +54,13 @@ {% csrf_token %} - +
{% csrf_token %} - +
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html index 25dc01e63..ae19e5db6 100644 --- a/bookwyrm/templates/lists/form.html +++ b/bookwyrm/templates/lists/form.html @@ -18,24 +18,73 @@
{% trans "List curation:" %} - +
+ + +

+ {% trans "Only you can add and remove books to this list" %} +

+
- +
+ + +

+ {% trans "Anyone can suggest books, subject to your approval" %} +

+
- +
+ + +

+ {% trans "Anyone can add books to this list" %} +

+
+ +
+ + +

+ {% trans "Group members can add to and remove from this list" %} +

- +
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py index fd4d2d767..3d9b6d241 100644 --- a/bookwyrm/tests/views/test_list.py +++ b/bookwyrm/tests/views/test_list.py @@ -10,6 +10,7 @@ from django.test.client import RequestFactory from bookwyrm import models, views from bookwyrm.activitypub import ActivitypubResponse +from bookwyrm.tests.validate_html import validate_html # pylint: disable=unused-argument class ListViews(TestCase): @@ -84,14 +85,14 @@ class ListViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) request.user = self.anonymous_user result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_saved_lists_page(self): @@ -110,7 +111,7 @@ class ListViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) self.assertEqual(result.context_data["lists"].object_list, [booklist]) @@ -127,7 +128,7 @@ class ListViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) self.assertEqual(len(result.context_data["lists"].object_list), 0) @@ -188,7 +189,7 @@ class ListViews(TestCase): is_api.return_value = False result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_list_page_sorted(self): @@ -210,7 +211,7 @@ class ListViews(TestCase): is_api.return_value = False result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) request = self.factory.get("/?sort_by=title") @@ -219,7 +220,7 @@ class ListViews(TestCase): is_api.return_value = False result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) request = self.factory.get("/?sort_by=rating") @@ -228,7 +229,7 @@ class ListViews(TestCase): is_api.return_value = False result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) request = self.factory.get("/?sort_by=sdkfh") @@ -237,7 +238,7 @@ class ListViews(TestCase): is_api.return_value = False result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_list_page_empty(self): @@ -250,7 +251,7 @@ class ListViews(TestCase): is_api.return_value = False result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_list_page_logged_out(self): @@ -271,7 +272,7 @@ class ListViews(TestCase): is_api.return_value = False result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_list_page_json_view(self): @@ -355,7 +356,7 @@ class ListViews(TestCase): result = view(request, self.list.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) request.user = self.anonymous_user @@ -375,7 +376,7 @@ class ListViews(TestCase): result = view(request, self.local_user.localname) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_user_lists_page_logged_out(self): @@ -404,7 +405,7 @@ class ListViews(TestCase): with patch("bookwyrm.views.list.is_api_request") as is_api: is_api.return_value = False with self.assertRaises(Http404): - result = view(request, self.list.id, "") + view(request, self.list.id, "") def test_embed_call_with_key(self): """there are so many views, this just makes sure it LOADS""" @@ -427,5 +428,5 @@ class ListViews(TestCase): result = view(request, self.list.id, embed_key) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) From 4e1b155c6c396aaabefb72fa2d44d3a80da46c45 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 11:21:21 -0800 Subject: [PATCH 10/24] Encode characters in iframe copy text --- bookwyrm/templates/lists/list.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 836ca864e..434ecd944 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -172,7 +172,7 @@
@@ -191,7 +191,16 @@ {% trans "Embed this list on a website" %}
- +
From 3e550a13adc32b0f3635ed8822752361563e2883 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 11:31:26 -0800 Subject: [PATCH 11/24] Unique names for shelve forms --- bookwyrm/templates/lists/list.html | 2 +- .../templates/snippets/reading_modals/finish_reading_modal.html | 2 +- .../snippets/reading_modals/progress_update_modal.html | 2 +- .../templates/snippets/reading_modals/start_reading_modal.html | 2 +- .../templates/snippets/reading_modals/want_to_read_modal.html | 2 +- .../snippets/shelve_button/shelve_button_dropdown_options.html | 2 +- .../templates/snippets/shelve_button/shelve_button_options.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 434ecd944..8bf7c052c 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -56,7 +56,7 @@
{{ book|book_description|to_markdown|default:""|safe|truncatewords_html:20 }}
- {% include 'snippets/shelve_button/shelve_button.html' %} + {% include 'snippets/shelve_button/shelve_button.html' with book=book %} {% endwith %} diff --git a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html index a35ed9e0b..fe35ee7e6 100644 --- a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html +++ b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html @@ -9,7 +9,7 @@ Finish "{{ book_title }}" {% endblock %} {% block modal-form-open %} - + {% csrf_token %} diff --git a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html index 422f7056e..3e0fd45e4 100644 --- a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html +++ b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html @@ -6,7 +6,7 @@ {% endblock %} {% block modal-form-open %} - + {% csrf_token %} {% endblock %} diff --git a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html index 423f77ebe..60c7a89e7 100644 --- a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html +++ b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html @@ -9,7 +9,7 @@ Start "{{ book_title }}" {% endblock %} {% block modal-form-open %} - + {% csrf_token %} diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html index 2fb976bf1..d6bc4d70a 100644 --- a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html +++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html @@ -9,7 +9,7 @@ Want to Read "{{ book_title }}" {% endblock %} {% block modal-form-open %} - + {% csrf_token %} diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html index 8c1881ce9..d418b7189 100644 --- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html +++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html @@ -32,7 +32,7 @@ {% elif shelf.editable %} - + {% csrf_token %} - + + {% csrf_token %} +
+
+
- -
+
+ +
+
+ +
+ + {% endif %} + {% if list.user == request.user or list.curation == 'open' and item.user == request.user or list.group|is_member:request.user %} -
+ {% csrf_token %} @@ -179,7 +190,13 @@ {% csrf_token %} - +
From 383f9fa228e94fea5e17fd6f264aaa5b886ef261 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 29 Dec 2021 20:41:11 +0100 Subject: [PATCH 13/24] Front-end: Update Feed summary card style Now the header's background is contained by the border-radius --- bookwyrm/templates/feed/summary_card.html | 50 ++++++++++++----------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/bookwyrm/templates/feed/summary_card.html b/bookwyrm/templates/feed/summary_card.html index 02718cdd9..e76bef912 100644 --- a/bookwyrm/templates/feed/summary_card.html +++ b/bookwyrm/templates/feed/summary_card.html @@ -1,29 +1,31 @@ -{% extends 'components/card.html' %} {% load i18n %} -{% block card-header %} -

- - - {% blocktrans %}{{ year }} in the books{% endblocktrans %} -

+
+
+

+ + + {% blocktrans %}{{ year }} in the books{% endblocktrans %} +

-
- {% trans "Dismiss message" as button_text %} - -
-{% endblock %} +
+ {% trans "Dismiss message" as button_text %} + +
+
-{% block card-content %} -

-{% blocktrans %}The end of the year is the best moment to take stock of all the books read during the last 12 months. How many pages have you read? Which book is your best-rated of the year? We compiled these stats, and more!{% endblocktrans %} -

+
+

+ {% blocktrans %}The end of the year is the best moment to take stock of all the books read during the last 12 months. How many pages have you read? Which book is your best-rated of the year? We compiled these stats, and more!{% endblocktrans %} +

-

- - {% blocktrans %}Discover your stats for {{ year }}!{% endblocktrans %} - -

-{% endblock %} +

+ + {% blocktrans %}Discover your stats for {{ year }}!{% endblocktrans %} + +

+
+ +
From 6075a8843825ddfac0385063039703208ac3a615 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 11:45:07 -0800 Subject: [PATCH 14/24] Validate html in get started views tests --- bookwyrm/tests/views/test_get_started.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 6d1819a4b..9d0222054 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -5,6 +5,7 @@ from django.test import TestCase from django.test.client import RequestFactory from bookwyrm import forms, models, views +from bookwyrm.tests.validate_html import validate_html @patch("bookwyrm.activitystreams.populate_stream_task.delay") @@ -40,7 +41,7 @@ class GetStartedViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @@ -72,7 +73,7 @@ class GetStartedViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_books_view_with_query(self, _): @@ -84,7 +85,7 @@ class GetStartedViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @@ -117,7 +118,7 @@ class GetStartedViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions") @@ -130,5 +131,5 @@ class GetStartedViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) From 0968802fd30a2559c6da41b03fbebc71fbccaf85 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 11:45:17 -0800 Subject: [PATCH 15/24] Adds alt tag to logo --- bookwyrm/templates/get_started/layout.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html index eef5a9e27..32db56d5d 100644 --- a/bookwyrm/templates/get_started/layout.html +++ b/bookwyrm/templates/get_started/layout.html @@ -10,7 +10,12 @@
- +

{% blocktrans %}Welcome to {{ site_name }}!{% endblocktrans %} From af63c9c187cb306490191eaed64cff1fac90bbaa Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 11:52:14 -0800 Subject: [PATCH 16/24] Line breaks, why not --- bookwyrm/templates/get_started/profile.html | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html index ef33afac2..587351fce 100644 --- a/bookwyrm/templates/get_started/profile.html +++ b/bookwyrm/templates/get_started/profile.html @@ -13,13 +13,26 @@
- + {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %}
- + {% include 'snippets/form_errors.html' with errors_list=form.summary.errors id="desc_summary" %}
From 65e59e7b562b24172d698917164fd498380607c2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 11:52:32 -0800 Subject: [PATCH 17/24] Validate search page html --- bookwyrm/tests/views/test_search.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index f80455113..0efb2278a 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -12,6 +12,7 @@ import responses from bookwyrm import models, views from bookwyrm.settings import DOMAIN +from bookwyrm.tests.validate_html import validate_html class Views(TestCase): @@ -62,7 +63,7 @@ class Views(TestCase): is_api.return_value = False response = view(request) self.assertIsInstance(response, TemplateResponse) - response.render() + validate_html(response.render()) @responses.activate def test_search_books(self): @@ -89,7 +90,7 @@ class Views(TestCase): is_api.return_value = False response = view(request) self.assertIsInstance(response, TemplateResponse) - response.render() + validate_html(response.render()) connector_results = response.context_data["results"] self.assertEqual(len(connector_results), 2) self.assertEqual(connector_results[0]["results"][0].title, "Test Book") @@ -107,7 +108,7 @@ class Views(TestCase): is_api.return_value = False response = view(request) self.assertIsInstance(response, TemplateResponse) - response.render() + validate_html(response.render()) connector_results = response.context_data["results"] self.assertEqual(len(connector_results), 1) self.assertEqual(connector_results[0]["results"][0].title, "Test Book") @@ -120,7 +121,7 @@ class Views(TestCase): response = view(request) self.assertIsInstance(response, TemplateResponse) - response.render() + validate_html(response.render()) self.assertEqual(response.context_data["results"][0], self.local_user) def test_search_users_logged_out(self): @@ -134,7 +135,7 @@ class Views(TestCase): response = view(request) - response.render() + validate_html(response.render()) self.assertFalse("results" in response.context_data) def test_search_lists(self): @@ -149,5 +150,5 @@ class Views(TestCase): response = view(request) self.assertIsInstance(response, TemplateResponse) - response.render() + validate_html(response.render()) self.assertEqual(response.context_data["results"][0], booklist) From 7623168410688520f77c7c3d1323fb962abbfbce Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 12:26:40 -0800 Subject: [PATCH 18/24] Fixes search html And suppresses more warnings --- bookwyrm/templates/search/layout.html | 2 +- bookwyrm/tests/validate_html.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html index 239586efa..af9129450 100644 --- a/bookwyrm/templates/search/layout.html +++ b/bookwyrm/templates/search/layout.html @@ -13,7 +13,7 @@
- +
diff --git a/bookwyrm/tests/validate_html.py b/bookwyrm/tests/validate_html.py index db0e832a0..0a3f61778 100644 --- a/bookwyrm/tests/validate_html.py +++ b/bookwyrm/tests/validate_html.py @@ -15,7 +15,11 @@ def validate_html(html): errors = "\n".join( e for e in errors.split("\n") - if "&book" not in e and "id and name attribute" not in e + if "&book" not in e + and "&type" 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 ) if errors: raise Exception(errors) From 9e5707a9e19faa6c5d0a7accdb028a831292f9c5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 12:31:14 -0800 Subject: [PATCH 19/24] Move templatetags test file into subdirectory --- bookwyrm/tests/templatetags/__init__.py | 1 + bookwyrm/tests/{ => templatetags}/test_templatetags.py | 0 2 files changed, 1 insertion(+) create mode 100644 bookwyrm/tests/templatetags/__init__.py rename bookwyrm/tests/{ => templatetags}/test_templatetags.py (100%) diff --git a/bookwyrm/tests/templatetags/__init__.py b/bookwyrm/tests/templatetags/__init__.py new file mode 100644 index 000000000..b6e690fd5 --- /dev/null +++ b/bookwyrm/tests/templatetags/__init__.py @@ -0,0 +1 @@ +from . import * diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/templatetags/test_templatetags.py similarity index 100% rename from bookwyrm/tests/test_templatetags.py rename to bookwyrm/tests/templatetags/test_templatetags.py From 0ae6d5e708fe61155b85b203333f5afddb47a325 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 12:33:42 -0800 Subject: [PATCH 20/24] Renames templatetags test file --- .../templatetags/{test_templatetags.py => test_bookwyrm_tags.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bookwyrm/tests/templatetags/{test_templatetags.py => test_bookwyrm_tags.py} (100%) diff --git a/bookwyrm/tests/templatetags/test_templatetags.py b/bookwyrm/tests/templatetags/test_bookwyrm_tags.py similarity index 100% rename from bookwyrm/tests/templatetags/test_templatetags.py rename to bookwyrm/tests/templatetags/test_bookwyrm_tags.py From 18213e2d2403f106c03705a08aa3c1aedf412ade Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 12:42:02 -0800 Subject: [PATCH 21/24] Moves tests into separate files --- .../tests/templatetags/test_bookwyrm_tags.py | 108 +----------------- .../tests/templatetags/test_interaction.py | 53 +++++++++ bookwyrm/tests/templatetags/test_markdown.py | 15 +++ .../tests/templatetags/test_status_display.py | 90 +++++++++++++++ bookwyrm/tests/templatetags/test_utilities.py | 52 +++++++++ 5 files changed, 212 insertions(+), 106 deletions(-) create mode 100644 bookwyrm/tests/templatetags/test_interaction.py create mode 100644 bookwyrm/tests/templatetags/test_markdown.py create mode 100644 bookwyrm/tests/templatetags/test_status_display.py create mode 100644 bookwyrm/tests/templatetags/test_utilities.py diff --git a/bookwyrm/tests/templatetags/test_bookwyrm_tags.py b/bookwyrm/tests/templatetags/test_bookwyrm_tags.py index ed4466f58..3265a905c 100644 --- a/bookwyrm/tests/templatetags/test_bookwyrm_tags.py +++ b/bookwyrm/tests/templatetags/test_bookwyrm_tags.py @@ -1,23 +1,15 @@ """ style fixes and lookups for templates """ -import re from unittest.mock import patch from django.test import TestCase -from django.utils import timezone from bookwyrm import models -from bookwyrm.templatetags import ( - bookwyrm_tags, - interaction, - markdown, - status_display, - utilities, -) +from bookwyrm.templatetags import bookwyrm_tags @patch("bookwyrm.activitystreams.add_status_task.delay") @patch("bookwyrm.activitystreams.remove_status_task.delay") -class TemplateTags(TestCase): +class BookWyrmTags(TestCase): """lotta different things here""" def setUp(self): @@ -52,83 +44,6 @@ class TemplateTags(TestCase): """there is no rating available""" self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 0) - def test_get_user_identifer_local(self, *_): - """fall back to the simplest uid available""" - self.assertNotEqual(self.user.username, self.user.localname) - self.assertEqual(utilities.get_user_identifier(self.user), "mouse") - - def test_get_user_identifer_remote(self, *_): - """for a remote user, should be their full username""" - self.assertEqual( - utilities.get_user_identifier(self.remote_user), "rat@example.com" - ) - - @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") - def test_get_replies(self, *_): - """direct replies to a status""" - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) - first_child = models.Status.objects.create( - reply_parent=parent, user=self.user, content="hi" - ) - second_child = models.Status.objects.create( - reply_parent=parent, user=self.user, content="hi" - ) - third_child = models.Status.objects.create( - reply_parent=parent, - user=self.user, - deleted=True, - deleted_date=timezone.now(), - ) - - replies = status_display.get_replies(parent) - self.assertEqual(len(replies), 2) - self.assertTrue(first_child in replies) - self.assertTrue(second_child in replies) - self.assertFalse(third_child in replies) - - def test_get_parent(self, *_): - """get the reply parent of a status""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) - child = models.Status.objects.create( - reply_parent=parent, user=self.user, content="hi" - ) - - result = status_display.get_parent(child) - self.assertEqual(result, parent) - self.assertIsInstance(result, models.Review) - - def test_get_user_liked(self, *_): - """did a user like a status""" - status = models.Review.objects.create(user=self.remote_user, book=self.book) - - self.assertFalse(interaction.get_user_liked(self.user, status)) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - models.Favorite.objects.create(user=self.user, status=status) - self.assertTrue(interaction.get_user_liked(self.user, status)) - - def test_get_user_boosted(self, *_): - """did a user boost a status""" - status = models.Review.objects.create(user=self.remote_user, book=self.book) - - self.assertFalse(interaction.get_user_boosted(self.user, status)) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - models.Boost.objects.create(user=self.user, boosted_status=status) - self.assertTrue(interaction.get_user_boosted(self.user, status)) - - def test_get_boosted(self, *_): - """load a boosted status""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - status = models.Review.objects.create(user=self.remote_user, book=self.book) - boost = models.Boost.objects.create(user=self.user, boosted_status=status) - boosted = status_display.get_boosted(boost) - self.assertIsInstance(boosted, models.Review) - self.assertEqual(boosted, status) - def test_get_book_description(self, *_): """grab it from the edition or the parent""" work = models.Work.objects.create(title="Test Work") @@ -145,25 +60,6 @@ class TemplateTags(TestCase): self.book.save() self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") - def test_get_uuid(self, *_): - """uuid functionality""" - uuid = utilities.get_uuid("hi") - self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid)) - - def test_get_markdown(self, *_): - """mardown format data""" - result = markdown.get_markdown("_hi_") - self.assertEqual(result, "

hi

") - - result = markdown.get_markdown("_hi_") - self.assertEqual(result, "

hi

") - - def test_get_mentions(self, *_): - """list of people mentioned""" - status = models.Status.objects.create(content="hi", user=self.remote_user) - result = status_display.get_mentions(status, self.user) - self.assertEqual(result, "@rat@example.com ") - def test_related_status(self, *_): """gets the subclass model for a notification status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): diff --git a/bookwyrm/tests/templatetags/test_interaction.py b/bookwyrm/tests/templatetags/test_interaction.py new file mode 100644 index 000000000..d32548e4c --- /dev/null +++ b/bookwyrm/tests/templatetags/test_interaction.py @@ -0,0 +1,53 @@ +""" style fixes and lookups for templates """ +from unittest.mock import patch + +from django.test import TestCase + +from bookwyrm import models +from bookwyrm.templatetags import interaction + + +@patch("bookwyrm.activitystreams.add_status_task.delay") +@patch("bookwyrm.activitystreams.remove_status_task.delay") +class InteractionTags(TestCase): + """lotta different things here""" + + def setUp(self): + """create some filler objects""" + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( + "bookwyrm.activitystreams.populate_stream_task.delay" + ): + self.user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + remote_id="http://example.com/rat", + local=False, + ) + self.book = models.Edition.objects.create(title="Test Book") + + def test_get_user_liked(self, *_): + """did a user like a status""" + status = models.Review.objects.create(user=self.remote_user, book=self.book) + + self.assertFalse(interaction.get_user_liked(self.user, status)) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + models.Favorite.objects.create(user=self.user, status=status) + self.assertTrue(interaction.get_user_liked(self.user, status)) + + def test_get_user_boosted(self, *_): + """did a user boost a status""" + status = models.Review.objects.create(user=self.remote_user, book=self.book) + + self.assertFalse(interaction.get_user_boosted(self.user, status)) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + models.Boost.objects.create(user=self.user, boosted_status=status) + self.assertTrue(interaction.get_user_boosted(self.user, status)) diff --git a/bookwyrm/tests/templatetags/test_markdown.py b/bookwyrm/tests/templatetags/test_markdown.py new file mode 100644 index 000000000..ba283a4f2 --- /dev/null +++ b/bookwyrm/tests/templatetags/test_markdown.py @@ -0,0 +1,15 @@ +""" style fixes and lookups for templates """ +from django.test import TestCase +from bookwyrm.templatetags import markdown + + +class MarkdownTags(TestCase): + """lotta different things here""" + + def test_get_markdown(self): + """mardown format data""" + result = markdown.get_markdown("_hi_") + self.assertEqual(result, "

hi

") + + result = markdown.get_markdown("_hi_") + self.assertEqual(result, "

hi

") diff --git a/bookwyrm/tests/templatetags/test_status_display.py b/bookwyrm/tests/templatetags/test_status_display.py new file mode 100644 index 000000000..b3eaeab87 --- /dev/null +++ b/bookwyrm/tests/templatetags/test_status_display.py @@ -0,0 +1,90 @@ +""" style fixes and lookups for templates """ +from unittest.mock import patch + +from django.test import TestCase +from django.utils import timezone + +from bookwyrm import models +from bookwyrm.templatetags import status_display + + +@patch("bookwyrm.activitystreams.add_status_task.delay") +@patch("bookwyrm.activitystreams.remove_status_task.delay") +class StatusDisplayTags(TestCase): + """lotta different things here""" + + def setUp(self): + """create some filler objects""" + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( + "bookwyrm.activitystreams.populate_stream_task.delay" + ): + self.user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + remote_id="http://example.com/rat", + local=False, + ) + self.book = models.Edition.objects.create(title="Test Book") + + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") + def test_get_replies(self, *_): + """direct replies to a status""" + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) + first_child = models.Status.objects.create( + reply_parent=parent, user=self.user, content="hi" + ) + second_child = models.Status.objects.create( + reply_parent=parent, user=self.user, content="hi" + ) + third_child = models.Status.objects.create( + reply_parent=parent, + user=self.user, + deleted=True, + deleted_date=timezone.now(), + ) + + replies = status_display.get_replies(parent) + self.assertEqual(len(replies), 2) + self.assertTrue(first_child in replies) + self.assertTrue(second_child in replies) + self.assertFalse(third_child in replies) + + def test_get_parent(self, *_): + """get the reply parent of a status""" + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) + child = models.Status.objects.create( + reply_parent=parent, user=self.user, content="hi" + ) + + result = status_display.get_parent(child) + self.assertEqual(result, parent) + self.assertIsInstance(result, models.Review) + + def test_get_boosted(self, *_): + """load a boosted status""" + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + status = models.Review.objects.create(user=self.remote_user, book=self.book) + boost = models.Boost.objects.create(user=self.user, boosted_status=status) + boosted = status_display.get_boosted(boost) + self.assertIsInstance(boosted, models.Review) + self.assertEqual(boosted, status) + + def test_get_mentions(self, *_): + """list of people mentioned""" + status = models.Status.objects.create(content="hi", user=self.remote_user) + result = status_display.get_mentions(status, self.user) + self.assertEqual(result, "@rat@example.com ") diff --git a/bookwyrm/tests/templatetags/test_utilities.py b/bookwyrm/tests/templatetags/test_utilities.py new file mode 100644 index 000000000..f40d24dcf --- /dev/null +++ b/bookwyrm/tests/templatetags/test_utilities.py @@ -0,0 +1,52 @@ +""" style fixes and lookups for templates """ +import re +from unittest.mock import patch + +from django.test import TestCase + +from bookwyrm import models +from bookwyrm.templatetags import utilities + + +@patch("bookwyrm.activitystreams.add_status_task.delay") +@patch("bookwyrm.activitystreams.remove_status_task.delay") +class UtilitiesTags(TestCase): + """lotta different things here""" + + def setUp(self): + """create some filler objects""" + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( + "bookwyrm.activitystreams.populate_stream_task.delay" + ): + self.user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + remote_id="http://example.com/rat", + local=False, + ) + self.book = models.Edition.objects.create(title="Test Book") + + def test_get_user_identifer_local(self, *_): + """fall back to the simplest uid available""" + self.assertNotEqual(self.user.username, self.user.localname) + self.assertEqual(utilities.get_user_identifier(self.user), "mouse") + + def test_get_user_identifer_remote(self, *_): + """for a remote user, should be their full username""" + self.assertEqual( + utilities.get_user_identifier(self.remote_user), "rat@example.com" + ) + + def test_get_uuid(self, *_): + """uuid functionality""" + uuid = utilities.get_uuid("hi") + self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid)) From b1687f5caceef21898770bb2fba29ab751559443 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 13:03:23 -0800 Subject: [PATCH 22/24] Adds another test --- .../tests/templatetags/test_bookwyrm_tags.py | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/bookwyrm/tests/templatetags/test_bookwyrm_tags.py b/bookwyrm/tests/templatetags/test_bookwyrm_tags.py index 3265a905c..04f6a5d4d 100644 --- a/bookwyrm/tests/templatetags/test_bookwyrm_tags.py +++ b/bookwyrm/tests/templatetags/test_bookwyrm_tags.py @@ -60,6 +60,35 @@ class BookWyrmTags(TestCase): self.book.save() self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") + def test_get_next_shelf(self, *_): + """self progress helper""" + self.assertEqual(bookwyrm_tags.get_next_shelf("to-read"), "reading") + self.assertEqual(bookwyrm_tags.get_next_shelf("reading"), "read") + self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "complete") + self.assertEqual(bookwyrm_tags.get_next_shelf("blooooga"), "to-read") + + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") + def test_load_subclass(self, *_): + """get a status' real type""" + review = models.Review.objects.create(user=self.user, book=self.book, rating=3) + status = models.Status.objects.get(id=review.id) + self.assertIsInstance(status, models.Status) + self.assertIsInstance(bookwyrm_tags.load_subclass(status), models.Review) + + quote = models.Quotation.objects.create( + user=self.user, book=self.book, content="hi" + ) + status = models.Status.objects.get(id=quote.id) + self.assertIsInstance(status, models.Status) + self.assertIsInstance(bookwyrm_tags.load_subclass(status), models.Quotation) + + comment = models.Comment.objects.create( + user=self.user, book=self.book, content="hi" + ) + status = models.Status.objects.get(id=comment.id) + self.assertIsInstance(status, models.Status) + self.assertIsInstance(bookwyrm_tags.load_subclass(status), models.Comment) + def test_related_status(self, *_): """gets the subclass model for a notification status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): @@ -70,10 +99,3 @@ class BookWyrmTags(TestCase): result = bookwyrm_tags.related_status(notification) self.assertIsInstance(result, models.Status) - - def test_get_next_shelf(self, *_): - """self progress helper""" - self.assertEqual(bookwyrm_tags.get_next_shelf("to-read"), "reading") - self.assertEqual(bookwyrm_tags.get_next_shelf("reading"), "read") - self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "complete") - self.assertEqual(bookwyrm_tags.get_next_shelf("blooooga"), "to-read") From e1ab34641868aa32498a40dea421c8593b49f576 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 13:34:38 -0800 Subject: [PATCH 23/24] Updates locales with new translations --- locale/de_DE/LC_MESSAGES/django.mo | Bin 61093 -> 61093 bytes locale/de_DE/LC_MESSAGES/django.po | 68 +++++------ locale/en_US/LC_MESSAGES/django.po | 166 +++++++++++++-------------- locale/es_ES/LC_MESSAGES/django.mo | Bin 73473 -> 73893 bytes locale/es_ES/LC_MESSAGES/django.po | 70 +++++------ locale/fr_FR/LC_MESSAGES/django.mo | Bin 75321 -> 75740 bytes locale/fr_FR/LC_MESSAGES/django.po | 70 +++++------ locale/gl_ES/LC_MESSAGES/django.mo | Bin 71753 -> 72278 bytes locale/gl_ES/LC_MESSAGES/django.po | 72 ++++++------ locale/lt_LT/LC_MESSAGES/django.mo | Bin 70920 -> 70920 bytes locale/lt_LT/LC_MESSAGES/django.po | 72 ++++++------ locale/pt_BR/LC_MESSAGES/django.mo | Bin 72209 -> 72607 bytes locale/pt_BR/LC_MESSAGES/django.po | 70 +++++------ locale/zh_Hans/LC_MESSAGES/django.mo | Bin 59040 -> 59040 bytes locale/zh_Hans/LC_MESSAGES/django.po | 66 +++++------ locale/zh_Hant/LC_MESSAGES/django.mo | Bin 37183 -> 37183 bytes locale/zh_Hant/LC_MESSAGES/django.po | 66 +++++------ 17 files changed, 376 insertions(+), 344 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index b86acb87bbed306497a7b49275582f3ba9df6223..7cf62013bb09fec06261af083e948ffa8f8334bc 100644 GIT binary patch delta 20 ccmZ2_mwD-3<_$>`Sd9#=49z#EPq2#v09)G!{Qv*} delta 20 ccmZ2_mwD-3<_$>`SPjjr42(CYPq2#v09)S&`~Uy| diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 1b06c1712..a4a2d55f4 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: 2021-12-28 15:00+0000\n" -"PO-Revision-Date: 2021-12-28 16:03\n" +"POT-Creation-Date: 2021-12-28 20:12+0000\n" +"PO-Revision-Date: 2021-12-28 21:17\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -263,76 +263,78 @@ msgstr "" msgid "Share this page" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "" -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "" +msgstr[1] "" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -340,33 +342,35 @@ msgstr "" msgid "by" msgstr "von" -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "" +msgstr[1] "" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" +msgid "All the books %(display_name)s read in %(year)s" msgstr "" #: bookwyrm/templates/author/author.html:18 diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 8de2afe9c..ccc82bf8e 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-28 20:12+0000\n" +"POT-Creation-Date: 2021-12-29 21:32+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -61,7 +61,7 @@ msgstr "" msgid "Rating" msgstr "" -#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:121 msgid "Sort By" msgstr "" @@ -145,7 +145,7 @@ msgstr "" msgid "%(value)s is not a valid username" msgstr "" -#: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:173 +#: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:170 #: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "" @@ -269,7 +269,7 @@ msgid "Copy address" msgstr "" #: bookwyrm/templates/annual_summary/layout.html:68 -#: bookwyrm/templates/lists/list.html:194 +#: bookwyrm/templates/lists/list.html:217 msgid "Copied!" msgstr "" @@ -520,7 +520,7 @@ msgstr "" #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/groups/form.html:24 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:75 +#: bookwyrm/templates/lists/form.html:124 #: bookwyrm/templates/preferences/edit_user.html:124 #: bookwyrm/templates/settings/announcements/announcement_form.html:76 #: bookwyrm/templates/settings/federation/edit_instance.html:82 @@ -642,7 +642,7 @@ msgstr "" msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:320 bookwyrm/templates/layout.html:77 +#: bookwyrm/templates/book/book.html:320 bookwyrm/templates/layout.html:74 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -656,7 +656,7 @@ msgstr "" #: bookwyrm/templates/book/book.html:341 #: bookwyrm/templates/book/cover_modal.html:31 -#: bookwyrm/templates/lists/list.html:182 +#: bookwyrm/templates/lists/list.html:195 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" @@ -940,8 +940,8 @@ msgstr "" #: bookwyrm/templates/components/modal.html:11 #: bookwyrm/templates/components/tooltip.html:7 #: bookwyrm/templates/feed/layout.html:71 -#: bookwyrm/templates/get_started/layout.html:20 -#: bookwyrm/templates/get_started/layout.html:53 +#: bookwyrm/templates/get_started/layout.html:25 +#: bookwyrm/templates/get_started/layout.html:58 #: bookwyrm/templates/search/book.html:49 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" @@ -1017,7 +1017,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:103 +#: bookwyrm/templates/layout.html:100 msgid "Directory" msgstr "" @@ -1137,7 +1137,7 @@ msgstr "" #: bookwyrm/templates/discover/discover.html:4 #: bookwyrm/templates/discover/discover.html:10 -#: bookwyrm/templates/layout.html:80 +#: bookwyrm/templates/layout.html:77 msgid "Discover" msgstr "" @@ -1260,12 +1260,12 @@ msgid "%(site_name)s home page" msgstr "" #: bookwyrm/templates/embed-layout.html:34 -#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:232 +#: bookwyrm/templates/landing/about.html:7 bookwyrm/templates/layout.html:229 #, python-format msgid "About %(site_name)s" msgstr "" -#: bookwyrm/templates/embed-layout.html:40 bookwyrm/templates/layout.html:236 +#: bookwyrm/templates/embed-layout.html:40 bookwyrm/templates/layout.html:233 msgid "Contact site admin" msgstr "" @@ -1279,7 +1279,7 @@ msgid "Direct Messages with %(username)s" msgstr "" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:113 +#: bookwyrm/templates/layout.html:110 msgid "Direct Messages" msgstr "" @@ -1332,7 +1332,7 @@ msgstr "" msgid "Updates" msgstr "" -#: bookwyrm/templates/feed/layout.html:12 bookwyrm/templates/layout.html:108 +#: bookwyrm/templates/feed/layout.html:12 bookwyrm/templates/layout.html:105 msgid "Your Books" msgstr "" @@ -1409,7 +1409,7 @@ msgid "What are you reading?" msgstr "" #: bookwyrm/templates/get_started/books.html:9 -#: bookwyrm/templates/layout.html:47 bookwyrm/templates/lists/list.html:138 +#: bookwyrm/templates/layout.html:47 bookwyrm/templates/lists/list.html:149 msgid "Search for a book" msgstr "" @@ -1429,7 +1429,7 @@ msgstr "" #: bookwyrm/templates/get_started/users.html:19 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/groups/group.html:20 bookwyrm/templates/layout.html:53 -#: bookwyrm/templates/layout.html:54 bookwyrm/templates/lists/list.html:142 +#: bookwyrm/templates/layout.html:54 bookwyrm/templates/lists/list.html:153 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 msgid "Search" @@ -1445,12 +1445,12 @@ msgid "Popular on %(site_name)s" msgstr "" #: bookwyrm/templates/get_started/books.html:58 -#: bookwyrm/templates/lists/list.html:155 +#: bookwyrm/templates/lists/list.html:166 msgid "No books found" msgstr "" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:51 +#: bookwyrm/templates/get_started/profile.html:64 msgid "Save & continue" msgstr "" @@ -1459,33 +1459,33 @@ msgstr "" msgid "Welcome" msgstr "" -#: bookwyrm/templates/get_started/layout.html:15 +#: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/get_started/layout.html:17 +#: bookwyrm/templates/get_started/layout.html:22 msgid "These are some first steps to get you started." msgstr "" -#: bookwyrm/templates/get_started/layout.html:31 +#: bookwyrm/templates/get_started/layout.html:36 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" msgstr "" -#: bookwyrm/templates/get_started/layout.html:35 +#: bookwyrm/templates/get_started/layout.html:40 msgid "Add books" msgstr "" -#: bookwyrm/templates/get_started/layout.html:39 +#: bookwyrm/templates/get_started/layout.html:44 msgid "Find friends" msgstr "" -#: bookwyrm/templates/get_started/layout.html:45 +#: bookwyrm/templates/get_started/layout.html:50 msgid "Skip this step" msgstr "" -#: bookwyrm/templates/get_started/layout.html:49 +#: bookwyrm/templates/get_started/layout.html:54 msgid "Finish" msgstr "" @@ -1494,29 +1494,29 @@ msgstr "" msgid "Display name:" msgstr "" -#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/get_started/profile.html:29 #: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "" -#: bookwyrm/templates/get_started/profile.html:22 +#: bookwyrm/templates/get_started/profile.html:34 msgid "A little bit about you" msgstr "" -#: bookwyrm/templates/get_started/profile.html:30 +#: bookwyrm/templates/get_started/profile.html:43 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "" -#: bookwyrm/templates/get_started/profile.html:39 +#: bookwyrm/templates/get_started/profile.html:52 msgid "Manually approve followers:" msgstr "" -#: bookwyrm/templates/get_started/profile.html:45 +#: bookwyrm/templates/get_started/profile.html:58 msgid "Show this account in suggested users:" msgstr "" -#: bookwyrm/templates/get_started/profile.html:49 +#: bookwyrm/templates/get_started/profile.html:62 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "" @@ -1908,7 +1908,7 @@ msgid "Login" msgstr "" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:181 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:178 #: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "" @@ -1917,7 +1917,7 @@ msgstr "" msgid "Success! Email address confirmed." msgstr "" -#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:172 +#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:169 #: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" @@ -1925,12 +1925,12 @@ msgstr "" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:176 bookwyrm/templates/ostatus/error.html:32 +#: bookwyrm/templates/layout.html:173 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "" -#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:178 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:175 #: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "" @@ -1962,19 +1962,19 @@ msgstr "" msgid "Search for a book, user, or list" msgstr "" -#: bookwyrm/templates/layout.html:63 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/layout.html:63 msgid "Main navigation menu" msgstr "" -#: bookwyrm/templates/layout.html:74 +#: bookwyrm/templates/layout.html:71 msgid "Feed" msgstr "" -#: bookwyrm/templates/layout.html:118 +#: bookwyrm/templates/layout.html:115 msgid "Settings" msgstr "" -#: bookwyrm/templates/layout.html:127 +#: bookwyrm/templates/layout.html:124 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:15 #: bookwyrm/templates/settings/invites/manage_invites.html:3 #: bookwyrm/templates/settings/invites/manage_invites.html:15 @@ -1982,46 +1982,46 @@ msgstr "" msgid "Invites" msgstr "" -#: bookwyrm/templates/layout.html:134 +#: bookwyrm/templates/layout.html:131 msgid "Admin" msgstr "" -#: bookwyrm/templates/layout.html:141 +#: bookwyrm/templates/layout.html:138 msgid "Log out" msgstr "" -#: bookwyrm/templates/layout.html:149 bookwyrm/templates/layout.html:150 +#: bookwyrm/templates/layout.html:146 bookwyrm/templates/layout.html:147 #: bookwyrm/templates/notifications/notifications_page.html:5 #: bookwyrm/templates/notifications/notifications_page.html:10 msgid "Notifications" msgstr "" -#: bookwyrm/templates/layout.html:177 bookwyrm/templates/ostatus/error.html:33 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "" -#: bookwyrm/templates/layout.html:189 +#: bookwyrm/templates/layout.html:186 msgid "Join" msgstr "" -#: bookwyrm/templates/layout.html:223 +#: bookwyrm/templates/layout.html:220 msgid "Successfully posted status" msgstr "" -#: bookwyrm/templates/layout.html:224 +#: bookwyrm/templates/layout.html:221 msgid "Error posting status" msgstr "" -#: bookwyrm/templates/layout.html:240 +#: bookwyrm/templates/layout.html:237 msgid "Documentation" msgstr "" -#: bookwyrm/templates/layout.html:247 +#: bookwyrm/templates/layout.html:244 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "" -#: bookwyrm/templates/layout.html:251 +#: bookwyrm/templates/layout.html:248 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "" @@ -2097,56 +2097,56 @@ msgstr "" msgid "List curation:" msgstr "" -#: bookwyrm/templates/lists/form.html:22 +#: bookwyrm/templates/lists/form.html:31 msgid "Closed" msgstr "" -#: bookwyrm/templates/lists/form.html:23 +#: bookwyrm/templates/lists/form.html:34 msgid "Only you can add and remove books to this list" msgstr "" -#: bookwyrm/templates/lists/form.html:27 +#: bookwyrm/templates/lists/form.html:48 msgid "Curated" msgstr "" -#: bookwyrm/templates/lists/form.html:28 +#: bookwyrm/templates/lists/form.html:51 msgid "Anyone can suggest books, subject to your approval" msgstr "" -#: bookwyrm/templates/lists/form.html:32 +#: bookwyrm/templates/lists/form.html:65 msgctxt "curation type" msgid "Open" msgstr "" -#: bookwyrm/templates/lists/form.html:33 +#: bookwyrm/templates/lists/form.html:68 msgid "Anyone can add books to this list" msgstr "" -#: bookwyrm/templates/lists/form.html:37 +#: bookwyrm/templates/lists/form.html:82 msgid "Group" msgstr "" -#: bookwyrm/templates/lists/form.html:38 +#: bookwyrm/templates/lists/form.html:85 msgid "Group members can add to and remove from this list" msgstr "" -#: bookwyrm/templates/lists/form.html:41 +#: bookwyrm/templates/lists/form.html:90 msgid "Select Group" msgstr "" -#: bookwyrm/templates/lists/form.html:45 +#: bookwyrm/templates/lists/form.html:94 msgid "Select a group" msgstr "" -#: bookwyrm/templates/lists/form.html:56 +#: bookwyrm/templates/lists/form.html:105 msgid "You don't have any Groups yet!" msgstr "" -#: bookwyrm/templates/lists/form.html:58 +#: bookwyrm/templates/lists/form.html:107 msgid "Create a Group" msgstr "" -#: bookwyrm/templates/lists/form.html:81 +#: bookwyrm/templates/lists/form.html:130 msgid "Delete list" msgstr "" @@ -2163,62 +2163,62 @@ msgstr "" msgid "Added by %(username)s" msgstr "" -#: bookwyrm/templates/lists/list.html:76 +#: bookwyrm/templates/lists/list.html:82 msgid "List position" msgstr "" -#: bookwyrm/templates/lists/list.html:82 +#: bookwyrm/templates/lists/list.html:88 msgid "Set" msgstr "" -#: bookwyrm/templates/lists/list.html:92 +#: bookwyrm/templates/lists/list.html:103 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 msgid "Remove" msgstr "" -#: bookwyrm/templates/lists/list.html:106 -#: bookwyrm/templates/lists/list.html:123 +#: bookwyrm/templates/lists/list.html:117 +#: bookwyrm/templates/lists/list.html:134 msgid "Sort List" msgstr "" -#: bookwyrm/templates/lists/list.html:116 +#: bookwyrm/templates/lists/list.html:127 msgid "Direction" msgstr "" -#: bookwyrm/templates/lists/list.html:130 +#: bookwyrm/templates/lists/list.html:141 msgid "Add Books" msgstr "" -#: bookwyrm/templates/lists/list.html:132 +#: bookwyrm/templates/lists/list.html:143 msgid "Suggest Books" msgstr "" -#: bookwyrm/templates/lists/list.html:143 +#: bookwyrm/templates/lists/list.html:154 msgid "search" msgstr "" -#: bookwyrm/templates/lists/list.html:149 +#: bookwyrm/templates/lists/list.html:160 msgid "Clear search" msgstr "" -#: bookwyrm/templates/lists/list.html:154 +#: bookwyrm/templates/lists/list.html:165 #, python-format msgid "No books found matching the query \"%(query)s\"" msgstr "" -#: bookwyrm/templates/lists/list.html:182 +#: bookwyrm/templates/lists/list.html:197 msgid "Suggest" msgstr "" -#: bookwyrm/templates/lists/list.html:191 +#: bookwyrm/templates/lists/list.html:208 msgid "Embed this list on a website" msgstr "" -#: bookwyrm/templates/lists/list.html:194 +#: bookwyrm/templates/lists/list.html:216 msgid "Copy embed code" msgstr "" -#: bookwyrm/templates/lists/list.html:194 +#: bookwyrm/templates/lists/list.html:218 #, python-format msgid "%(list_name)s, a list by %(owner)s on %(site_name)s" msgstr "" @@ -2697,7 +2697,7 @@ msgstr "" msgid "Edit Announcement" msgstr "" -#: bookwyrm/templates/settings/announcements/announcement.html:35 +#: bookwyrm/templates/settings/announcements/announcement.html:34 msgid "Visible:" msgstr "" @@ -2709,19 +2709,19 @@ msgstr "" msgid "False" msgstr "" -#: bookwyrm/templates/settings/announcements/announcement.html:47 +#: bookwyrm/templates/settings/announcements/announcement.html:46 #: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "" -#: bookwyrm/templates/settings/announcements/announcement.html:54 +#: bookwyrm/templates/settings/announcements/announcement.html:51 #: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "" -#: bookwyrm/templates/settings/announcements/announcement.html:60 +#: bookwyrm/templates/settings/announcements/announcement.html:55 #: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "" @@ -4284,7 +4284,7 @@ msgstr "" msgid "Not a valid csv file" msgstr "" -#: bookwyrm/views/landing/login.py:69 +#: bookwyrm/views/landing/login.py:70 msgid "Username or password are incorrect" msgstr "" diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index 1169b92fe8dc7c9f519d6db5115b95de1e30e670..dcbbaf95e3fea63216e12e62411b9b005d9998cf 100644 GIT binary patch delta 14949 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 delta 14937 zcmYk?cX(Ds+Q;$pq>)BKLPAJFLP80>q|lKfh!A>BDAEL_gA^$N4q-!8X+c3iSt+Z4 zC=jWlR1pNENR=iiML40s?X{noIcH|>xo74ipeuLzWPj^3r;ppqah&*8 zjuVTMFa?)jc|3we@EMlCu-1-~ifPyY`(Ybgg;ntx7RL%ShGKJ!!mgNrBd`U|x9ykP zIIa^x!&BQ3($;a}s3&0uY>Y|xp>5xZdjBFSp!=AJMcT0ltcj7BfzdeF)~8`N>K~y3 zdxmKk*xu#;DAaFn9;9Pw>Rm7dC!sPk8%yFEOu-{K6upR24#y#Q1$pGO?dUi?aV7Ra zzfO#a1F~{HjG`4x#sRn)6R-rc zG{#0a4yU6g^k(n|_!??UKgMe4Zlq9-!Yyo#k%XmsUsUR6qc3j4!nhs%@F@D@X)K7p zU;(^ipFgto7q;&EnpsFN>b-cRzw0DX@TQ>(hGQyfOPXLXwna_U9Ru)9)E>Tt+M;aR zKF7KU)qe%5|Cd+@x1-)aj6rxF!K_QujXQ-7`>~1=wq9SdK%0LU$fbCEN^*{wS z1hs(Cr~tF9Q&54gzqfC}IY zYU1lS5O1MwLq<>Rq5>*`ny?xw zwT-bTwnh!y&pHf!sE@%&oPY{E7xn&sQ5o5a3hY2{@~;l3X~^FbRH|>F2EJooe1y6M zK3o+AQUuknG-_|lqXMggwXq56)MumKKZkShCTjewKBhgpk81{=LxUbHLq+_Vt#3rF z&>>oF%|mU;cKgCU z)XIOv{A*^tW84467@mi`VYaHAwJy%4y)|m0OQ-;@qXKx0n%DJz)4ULdiaZ+iViFd| z>gbD|&=0$zz5}nL-XDz$EC;oP^KARasMN1PEnu5%KZJVktf{-sRSFvL9%}FW`Z-Qz zY={GK7%GtSSOEXV{Ik&CWU2^i?-Nh~Rj~D%sK6T8dRtUL-OvXIVubGhFbaxj3aZ0g z)SfRzt#~7<<95^p2T|{z!3g}#wm(Jn_Zwh->P4VVeMQtQdIc4DCdT3b?92SlR0@H3 z8#TdW)JlC=zV<2@wFPmgttp8*bg3ACgRF0(`b|QAoR0b)%tZy3hw8t}){mj9)L*g< z_w5UwL1yJ)sDO&11}=>{Y?V+cY>LWMOVr9<#~>Vq!I+H-aF%r;YN5+)eeEFfA56n$ z`(Us22&(;O%s;iZ{V{3+ufg`zqcTwrm7(6K_xqu?Yz!)c(@CjW}? zI~ugYBdC;}M(x>C)E);9G4(`L0BNX+8ld{Mv1Vcj^`58&3`O-Hk9uz|D$oy60W5VX zD1gsUTd~2q50&Ddu^?VT-GV<*0~Z`>0*yhftS&}jBTT@q7=q(b6TO4V#C+72twi;6 zzowvxcO$=hIH#}_Rvu;|Z;zqW`=L(r7}Wc7Q7c-B+WWPr_jaHbbOaT^SzEt>%G^EM z{tps}>lA#;bS#M)Fcp>hI;hB7VHjqhChm_qL=#Y%nU0$116yB-N^u@)oUN#d4`B+P zL9IM!xE9F%hf`3*WiSqtQK@fj+dH6A-W@g2K>K_&DuD5*J)UWwFSXCtpcb&sx)l}J zZtH$*s{8*V1w|A!!t7x@s$Sjt5*DJ~7!^oI)Wp3}zsn87Fr0=8@I%xGW+iG%cA)|} zhRX2I$PYs23cBjhWTbha9jZfD)FBy&8aNv@VJ<4wpV;j_3Liy15gtWLoLXiLP2}C0Bhi9s6+M(R>nV20~Q-+I+Q~F45*GeWNlHO z)WN7Nn29wp*VYeNPolQsB8KDdM%Ve9f+7mdGL}LOSPK-kcCu&O%qB8glU8PD{C)cGI8Dd08^-YvP~w_P=Pc<1>Dx!CEG^$It{v315p_mhox~Qs^dEA7SsSc zQ2`%71#%7*@Kw~F-^TpIhNY+nO*XfsDr)=|sN2xZwS_lPdomm~&=}N2dae~tx9#tt z0-BEscnQ|QHK_NlqcU+DmGY;yUf@6G{RmV5B~jzJsT9CzixV$osAnlVh$?6;w)lpdxz>>v;60JqNWV)6oa_q7L-|RAw)rFW$l+=6C+0;D;})KGRH!gHRcX z#RRNm>#a}$_e7<9Fe>GfQP*>peZCu&fg`AiFQNjuje6giPW}~PFon_>hU!oQ3t$t} zM6FOO>xzT12m0e->nYTkxP)c#PppbXXPA{XLygxObt^JZ-<1I~$iF7Yq9FjMTjyZ{ z^(ClCzd^0^0G7gwsDQm^nt{uqR+x-hKz;PbRv3U8sKeb0U&bsfgWt|1{}m`)qoD+b zzhefhhU)kdD$-X`Tak%c=>XIZk#SfY=VBnP#~|E}3TQuS<)={nE~2*jj;%j*Dd>lb z@4My{$DukjMy;R)s$)l6?~58>2r9r)w%tXY?&+x8u^M%2cA~~RhYILdRKLGa%|oSZn{D5XLDctSD4sywn%}S^{*KB-{aj;HYg<&R zyP(GFV;zJVXCxNZ{m-GG0T!ZC`-!b@K@G6W)(>Jq>L*YGT(Rxiysk z%&mz;)srv`t6&H=M2*+x1M;ti5i~^NWK;kPQIW1ib^IE`@vwdV3l^sS5VbV{3yhJd z_Y+YQr=reET};9*s0C-E7BFi8`B&=Z)1VK;5>z0YkaOr9LgsL~Ei?h$M`gzIq1l2U z)IhPQfD^GgR>3y-1}Za~u^L`N-ImBj=GXiNE`=5}{Ds}I-eU8+;76E3eLFV9Kd~Jq zFEPKQ=Ab@28&LQDIF7>ySOJHAWIn-*Q42bR`DX@8Q@@7_&@KA0xn})QDg6p7;(k=B z9-f~a~l4#!g16&Kj{`>0I(gWB5Q|C)ZWs6fhKaeN6G-*sN2(1C^lsKc}a zHSj)EW@>$6QZ^Np>h-8C+l(!72e!h3%S^o+Ds!vR3ol?Y{(|8czTAvc8bfveD^Sp3 zse{_1#;BE#!?HLHHNiSe$A7UArmrv)&O+7CV?#_>X~ye~&8ZJW9n#IH1?{mG`XA4k z-+7HfRa}LQ@n=*Z$*FHfy&r^+kO;v zMoyutg4Zhkz=@U7A9rCF`~fRr>D6Xy+G8~JF4z-Cq6R*RX?OuAVE7s{&K&E9sMIgR zMBIoa@bnt;|G>kaL};i$!=G!-A&LFMT$^Ofq`fn~f*Vj1J;8oh=}Yr(#Xi8k)PvWV z+cO;X-dxmK*oP7L6iZ{sdUH+F){}qj*+3fF;##bS|Ds;3x4}f-2Va8&W-$cDP9pms4s{aercuDS8<~N##sDa+VSe${nCM&JqVL0`xsO$Cw zb)P$IG%M+Yfz%hH-uoX`#H|>D*H8gG#8OyzllfiItw~`x4TEqHUc#Z+VzW7P+p!1r zLR(DAhhb;xXYn;m-OASy=i(c92lc$;Hq-A*tU^8XYZF*~98bL+5}@lGp-`WOzi~9y z-ERJX@D-+0KZ8@SN&EQCHg&1sKBo$g|&=cUjOE1}*?Lp^^51F)s7XP~yA2kKf5N4-DE*5{(O zWGO~4zw-r!NZf;Za2B<^)EjJp3WbI4+>X{h&FVFY%^YB&NF&?;2FJk;6v4i(T* zOu~!kY5?EecEzX^6+=Z_!kUW3s5eHftQXe6kyr~qw_d}N)D!lYUt}6%1L|F|I4(hD zY&$BWd-srkO>~$BMSKw_;|)x~fqTuT^k{_n8ci!ywvc zU@*Rq3Sb#(A-nDKOZ&*buEi}HG;qN8#xV4w9*ydlU~PaUsrN)}Sq>`2i%=7Oj@pVX zs1+VYE$kHP(EWmG_yD7@oV(woydf5);Z-bvJ+T+|!!Gy(YT(ib%)iO3jSBD}M&ohR z*4##a{1=rm{~yeFMKO_j0_yq8sDRw&6k1d0foop|&IoHPL(4HK+v~Kppa9SWx%>G=(4AFCSb-9Gu{}?|NVa&1x2n;#_n}gK($;U< z=TFgx_Q0bi6QQVn{8;nX^$9)xQ~P!uA-BT~V1Bf;tB?GV56`U&Oin91uDR8sLXtiCGadp;@_xw!cUnDRK`No-5M0M;-;u;k%1cM zHT%K<)QYlDpUzpRl&(R&pNC56R#d;;sFfZ;W%LGWE1c7&9*8=WC6EAIC!K=!qAO~k zv8X+rj9S4GRHQpl106+W;AhmH-$89*!82y15tvE6JSs!~!6Nt>M&S4MlBv zadh=UWePEvhDv#B`@(S42PPY};;GizsD2BrA7gXsD^O?SE-Lj;Q2pZ08J03) z^>e6t017HWVwsEIy8P4qcxWnZDL<2R_E=SQ(P-ouU<{)_qDt{-Z= z*{IB{z+$)#wXnlh_c8?y{1CMj|DYlaxojeg#CYmuP^oW%`71z8kb&B|L8!oUP%EE{ zyK%F1+!b?XUi#H+O(Uc0bfBP#`=VAd3bp6&qcU*7K0jmYH&BP~F=|CGuqej-X7)N2 z>rros3h-S_!B0?upRn!cFkV0Z?^4hnhF&!TmPf7VRcwnrP%B?={Th|h?@$vTLmjf4 zw(fJy>~$QLracvPSUaQk{7qEllohcMFz7bFdliL`@WUgTHRUBB=K}SVy3%0q0Rr%GRK+%}p$Y&oKcLem7gu5bINK zgX%X2({UA6!Uw2{O58Ln?ulC15Y$#qM_*ike)!Q%@~;OgXi$ps?2Egw0QIBx#WNU4 z{SwZ`n^+yk-7*8MN4>uV6LBZ%OkF{pfqSUT7PxH=dki+9Uh+2iZ%LsK4MDg81Mpj0 z-;cr6PuTX$s6D)e#qk9uVB8;OrS(u5%tTGx9~Ia{ERR!BnOlz)@CTQIR`v)rvFDCC zj6tY-nuJ)PSiwaur~gM3Z&wnCSz%+er_EKx<-vr z0ravD24XPvk*F_XHkQQ&sP}iGKB*T_6F)%h?Z4=QzIRPM5H(RD)cDa@5KAHfxlS?# zO;8J)V{6pmSd7ZRGE^!zVIe$-TH$%y{s1*_z+YzI!lU_sm~3#Gu}9fqJh8s$W0U&zj*_ z9%o@R^E+E9D6*fhAzs7;Ot^1W+z_?mcGdx?!!sE*!57xesMPL6jrSueb7xU|e+R?x z5iUgk2jssJg-muyq%UP@jw8_!%m|uTl4Z531i) zR3ML0@BM=cFzm7U%c{7?6^&Y5{jz*<;Ix16hu_P`=os}J^ z>*#rA{`?S+8ZQ$S@HA9lxu}4bqcXV}^$Ux8h(b{cf1+06|J-yaj|!kRY9-B4fn=gm z*$b80k*I;QFcxQH6b)GylSHC~uA(bU=nqjdiVQP7tw2el_Nu^N7b8u%vG$LGlT zaq9eI{#8uMzvhfgvF4#tdl@U>Bh>eygyV47RwVjhok5^JCi zVL>lrDXd7nj;;5@R@7b8t@#m^xj#@DdV$J}ueT@v%!Ht>b5Yb*#i7Pe#{B>OzbS=I zG_*r?T!lJ38&E0z*47WACOU2F*D;d%eN4arAM?CC7N=et^}GveykV#S$De6!JNkL@@A*Jf;1e(jr&`yd#yf%f9{h&7 z){jt!u~Y%qbgWUpq^bex45ZuoNL0s(wmt`SCKjRgdJUGrov46spbqV0RDfarp8W4Y z8C1V&sPUShwj$G|phyOxQlz@R-S40V_yD!C&#@S8L>;Q*sP~_sQtA_6>cJRCy(nsr ztK(8^iA(SgR7Pe7ngzRyC}<@sP`6+!>I=35Q}8f$L?_6T|H0^lb*YZUYPbpa;%)4X z>x0b}6)I@Xz)aM2UTwXC>C|IF@(;D^^rcXqhIv>Ozd=QO2Nl4qP&3gkRO%k1QWsFj zT%$PbN4*(p;0>sizra+C2s0~fipp#|>udRP|N2pQn+GGX2i~+Vq=%bSb+qImqcYM2wN+zLXU9byu6d{cm!r03Eo#NTVimlD8aKX(+0sGiYU14#x?y;fiF7Ew zOnnpT@IA#A=vCBA*cv-f?~ToIGwOrn9c=<^hiadK8F&oaVYwJH@p!CB{df%bU#C1M z)_gz`Q7d^F^;51rDuB_b(>@8cqIXe;bOBbxm8caS$N!>NF*D9`)S>(e^}KMLNqr;K zJn3;wJkU1`unCs2px0#3lNcys7xqn>|)I((~9KP|t-1pFmFuXe2=9?y{6RkeqD zC3@w>)JgGp1vMrvd?d0978}9MC>y_(Q?_;k)Ub+9PSI^^@d$rzBeJh-KUVLEi z5q9x#K=5+z;QH6Srh0NaHPGX{n+@VU(Qk7Ka;TM6Fa8On+>N${d5JH3`+3rGOE+Cw z\n" "Language-Team: Spanish\n" "Language: es\n" @@ -263,76 +263,78 @@ msgstr "El año de lectura de %(display_name)s" msgid "Share this page" msgstr "Compartir esta página" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "Copiar dirección" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "¡Copiado!" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "Nivel de compartido: público con llave" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "La página puede ser vista por cualquier persona que tenga la dirección completa." -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "Hacer privada la página" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "Nivel de compartido: privado" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "La página es privada, solo tú puedes verla." -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "Hacer pública la página" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "Una vez que haces privada tu página, la clave antigua ya no dará acceso a la página. Si la página se vuelve a hacer pública se creará una nueva clave." -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "Lamentablemente, %(display_name)s no terminó ningún libro en %(year)s" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "En %(year)s %(display_name)s ha leĂ­do %(books_total)s libros
¡haciendo un total de %(pages_total)s páginas!" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "En %(year)s %(display_name)s ha leĂ­do %(books_total)s libro
¡haciendo un total de %(pages_total)s páginas!" +msgstr[1] "En %(year)s %(display_name)s ha leído %(books_total)s libros
¡haciendo un total de %(pages_total)s páginas!" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "¡Eso es genial!" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." msgstr "Eso hace un promedio de %(pages)s páginas por libro." -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" msgstr[0] "(%(no_page_number)s libro no tiene páginas)" msgstr[1] "(%(no_page_number)s libros no tienen páginas)" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "Su lectura más corta de este año…" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -340,34 +342,36 @@ msgstr "Su lectura más corta de este año…" msgid "by" msgstr "por" -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "%(pages)s páginas" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "… y la más larga" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "%(display_name)s dio %(ratings_total)s valoraciones,
su valoraciĂłn media es %(rating_average)s" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "%(display_name)s dio %(ratings_total)s valoraciĂłn,
su valoraciĂłn media es %(rating_average)s" +msgstr[1] "%(display_name)s dio %(ratings_total)s valoraciones,
su valoraciĂłn media es %(rating_average)s" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "Su mejor valoraciĂłn" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "Su valoraciĂłn: %(rating)s" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" -msgstr "Todos los libros que ha leĂ­do %(display_name)s en 2021" +msgid "All the books %(display_name)s read in %(year)s" +msgstr "Todos los libros que ha leĂ­do %(display_name)s en %(year)s" #: bookwyrm/templates/author/author.html:18 #: bookwyrm/templates/author/author.html:19 diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index bf14adb8206cb519f46bb0bedb0bd29f66dcb88b..bbac096ea57ad2cd4529cb35d9ceea92a2f0c9f3 100644 GIT binary patch delta 14969 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
|NUJgcmsV1Njn1(v-%dr`LiP~$Q-%P0k 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 tJ#q(c%*<`LF+IR`}2A delta 14942 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 njq>&xGIV6W5jl<4C*_`4zbPo^XkO*qJ$aSN\n" "Language-Team: French\n" "Language: fr\n" @@ -263,76 +263,78 @@ msgstr "l’année de lecture de %(display_name)s" msgid "Share this page" msgstr "Partager cette page" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "Copier l’adresse" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "Copié!" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "Statut de partage : public avec clé" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "La page peut être consultée par toute personne ayant l'adresse complète." -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "Rendre cette page privée" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "Statut de partage : privé" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "La page est privée, seulement vous pouvez la voir." -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "Rendre cette page publique" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "Lorsque vous rendez votre page privée, l’ancienne clé ne donnera plus accès à la page. Une nouvelle clé sera créée si la page est à nouveau rendue publique." -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "Malheureusement, %(display_name)s n’a terminé aucun livre en %(year)s" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "En %(year)s, %(display_name)s a lu %(books_total)s livres
pour un total de %(pages_total)s pages !" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "En %(year)s, %(display_name)s a lu %(books_total)s livre
pour un total de %(pages_total)s pages !" +msgstr[1] "En %(year)s, %(display_name)s a lu %(books_total)s livres
pour un total de %(pages_total)s pages !" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "C’est génial !" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." msgstr "Ce qui fait en moyenne %(pages)s pages par livre." -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" msgstr[0] "(%(no_page_number)s livre n’a pas de pages)" msgstr[1] "(%(no_page_number)s livres n’ont pas de pages)" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "Sa lecture la plus courte l’année…" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -340,34 +342,36 @@ msgstr "Sa lecture la plus courte l’année…" msgid "by" msgstr "de" -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "%(pages)s pages" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "…et sa plus longue lecture" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "%(display_name)s a laissé %(ratings_total)s notes,
sa note moyenne est %(rating_average)s" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "%(display_name)s a laissé %(ratings_total)s critique,
sa note moyenne est %(rating_average)s" +msgstr[1] "%(display_name)s a laissé %(ratings_total)s critiques,
sa note moyenne est %(rating_average)s" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "Son avis le mieux noté" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "Sa note : %(rating)s" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" -msgstr "Tous les livres que %(display_name)s a lus" +msgid "All the books %(display_name)s read in %(year)s" +msgstr "Tous les livres que %(display_name)s a lus en %(year)s" #: bookwyrm/templates/author/author.html:18 #: bookwyrm/templates/author/author.html:19 diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index d6d47d04beb95983819594a84601cd80ed8f90eb..d0e70f055137b8d7e1ab37551b004b8af07e51b1 100644 GIT binary patch delta 19939 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 WNIF+yLXxX*uWm^RshwUv%=16fjvqPz delta 19776 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 b_PGzQ`1yF|&bm@KInUKxp~;D_@8\n" "Language-Team: Galician\n" "Language: gl\n" @@ -263,76 +263,78 @@ msgstr "Un ano de lecturas de %(display_name)s" msgid "Share this page" msgstr "Comparte esta páxina" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "Copiar enderezo" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "Copiado!" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "Compartir estado: público con chave" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "Esta páxina será visible para calquera que teña o enderezo completo." -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "Facer privada a páxina" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "Compartir estado: privado" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "Esta páxina é privada só ti podes vela." -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "Facer pública a páxina" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "Cando fas privada unha páxina, a chave antiga non dará acceso á mesma nunca máis. Crearase unha nova chave se volves a facer pública a páxina." -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "Unha mágoa, pero %(display_name)s aínda non rematou ningún libro en %(year)s" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "En %(year)s, %(display_name)s leu %(books_total)s libros
cun total de %(pages_total)s páxinas!" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "En %(year)s, %(display_name)s leu %(books_total)s libro
cun total de %(pages_total)s páxinas!" +msgstr[1] "En %(year)s, %(display_name)s leu %(books_total)s libros
cun total de %(pages_total)s páxinas!" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "Está moi ben!" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." -msgstr "" +msgstr "Esto fai unha media de %(pages)s páxinas por libro." -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" msgstr[0] "(%(no_page_number)s libro non ten páxinas)" msgstr[1] "(%(no_page_number)s libros non teñen páxinas)" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "A lectura máis curta deste ano…" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -340,34 +342,36 @@ msgstr "A lectura máis curta deste ano…" msgid "by" msgstr "por" -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "%(pages)s páxinas" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "…e a máis longa" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "%(display_name)s escribiu %(ratings_total)s valoraciĂłns,
a media das sĂşas valoraciĂłns Ă© %(rating_average)s" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "%(display_name)s fixo %(ratings_total)s valoraciĂłn,
cunha media de %(rating_average)s" +msgstr[1] "%(display_name)s fixo %(ratings_total)s valoraciĂłns,
cunha puntuación media de %(rating_average)s" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "A súa recensión máis valorada" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "Valoración: %(rating)s" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" -msgstr "Tódolos libros lidos por %(display_name)s en 2021" +msgid "All the books %(display_name)s read in %(year)s" +msgstr "Tódolos libros que %(display_name)s leu en %(year)s" #: bookwyrm/templates/author/author.html:18 #: bookwyrm/templates/author/author.html:19 diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index d4cb5e29be5fd2945b1b7dfdc1b6ca3c7ffcc573..21cce6fa704edb83cd31f036fc4884c304c6389a 100644 GIT binary patch delta 20 ccmeBJ#nQ2gWy7f@tVV`bhUS~kFR?5D09ft_WB>pF delta 20 ccmeBJ#nQ2gWy7f@tcGS*2F9DuFR?5D09f(}V*mgE diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 61c42289a..6a0971a34 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: 2021-12-28 15:00+0000\n" -"PO-Revision-Date: 2021-12-28 16:03\n" +"POT-Creation-Date: 2021-12-28 20:12+0000\n" +"PO-Revision-Date: 2021-12-28 21:17\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -263,63 +263,67 @@ msgstr "" msgid "Share this page" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "Nukopijuota" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "" -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" @@ -328,13 +332,13 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -342,33 +346,37 @@ msgstr "" msgid "by" msgstr " " -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" +msgid "All the books %(display_name)s read in %(year)s" msgstr "" #: bookwyrm/templates/author/author.html:18 diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index ef3d0c17070eb898d11ffce85c7e4aa07bbbbc23..3862e0bb954ad25ba4268e1bcb3bf78a4c750d29 100644 GIT binary patch delta 15050 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 delta 14979 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 CA15pT diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index a2d20005c..f8bbf8ec9 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: 2021-12-28 15:00+0000\n" -"PO-Revision-Date: 2021-12-28 16:59\n" +"POT-Creation-Date: 2021-12-28 20:12+0000\n" +"PO-Revision-Date: 2021-12-29 00:08\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -263,76 +263,78 @@ msgstr "O ano de leitura de %(display_name)s" msgid "Share this page" msgstr "Compartilhe esta página" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "Copiar endereço" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "Copiado!" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "Compartilhamento: público com chave" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "Esta página pode ser vista por qualquer pessoa que tenha seu link." -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "Tornar a página particular" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "Compartilhamento: particular" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "A página é particular, só você pode vê-la." -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "Tornar a página pública" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "Ao tornar a página particular, a chave antiga passa a não funcionar mais. Uma nova chave será gerada quando a página for tornada pública novamente." -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "Infelizmente %(display_name)s não terminou nenhum livro em %(year)s" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "Em %(year)s, %(display_name)s leu %(books_total)s livros,
um total de %(pages_total)s páginas!" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "Em %(year)s, %(display_name)s leu %(books_total)s livro,
um total de %(pages_total)s páginas!" +msgstr[1] "Em %(year)s, %(display_name)s leu %(books_total)s livros,
um total de %(pages_total)s páginas!" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "Muito legal!" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." msgstr "Isso dá uma média de %(pages)s páginas por livro." -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" msgstr[0] "(%(no_page_number)s livro não tem páginas cadastradas)" msgstr[1] "(%(no_page_number)s livros não têm páginas cadastradas)" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "A leitura mais curta do ano…" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -340,34 +342,36 @@ msgstr "A leitura mais curta do ano…" msgid "by" msgstr "de" -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "%(pages)s páginas" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "…e a mais longa" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "%(display_name)s fez %(ratings_total)s avaliações,
e sua nota média é %(rating_average)s" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "%(display_name)s fez %(ratings_total)s avaliação,
com uma média de %(rating_average)s" +msgstr[1] "%(display_name)s fez %(ratings_total)s avaliações,
com uma média de %(rating_average)s" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "Sua melhor avaliação" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "Avaliação: %(rating)s" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" -msgstr "Todos os livros que %(display_name)s leu em 2021" +msgid "All the books %(display_name)s read in %(year)s" +msgstr "Todos os livros lidos por %(display_name)s em %(year)s" #: bookwyrm/templates/author/author.html:18 #: bookwyrm/templates/author/author.html:19 diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index bbfee4c5fd0ff23ee17273b95f7df35fa34a3502..fdd768973fc969ad186d9e25d2748400c0a31ebc 100644 GIT binary patch delta 20 ccmZ2*mU+Qh<_!tcSd9#=49z#EPO}aG09h6X$^ZZW delta 20 ccmZ2*mU+Qh<_!tcSPjjr42(CYPO}aG09hIb$p8QV diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 501db0b89..08559cd89 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: 2021-12-28 15:00+0000\n" -"PO-Revision-Date: 2021-12-28 16:03\n" +"POT-Creation-Date: 2021-12-28 20:12+0000\n" +"PO-Revision-Date: 2021-12-28 21:17\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -263,75 +263,76 @@ msgstr "" msgid "Share this page" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "" -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" msgstr[0] "" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -339,33 +340,34 @@ msgstr "" msgid "by" msgstr "作者" -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" +msgid "All the books %(display_name)s read in %(year)s" msgstr "" #: bookwyrm/templates/author/author.html:18 diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo index 4b754cce936b086a073d03e2e010dbdd0124fea0..fcfea57064a4a4560758d8a603d24c2cc670531a 100644 GIT binary patch delta 20 bcmdnLh-v>KrVXYEtVV`bhUS~C5?BoZQ2z#* delta 20 acmdnLh-v>KrVXYEtcGS*2F9DMfD8ap0|uA? diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index d5c5d0680..15bd82c07 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-28 15:00+0000\n" -"PO-Revision-Date: 2021-12-28 16:03\n" +"POT-Creation-Date: 2021-12-28 20:12+0000\n" +"PO-Revision-Date: 2021-12-28 21:17\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -263,75 +263,76 @@ msgstr "" msgid "Share this page" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:61 +#: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:194 msgid "Copied!" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:69 +#: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:70 +#: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:75 +#: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:81 +#: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:82 +#: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:87 +#: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:91 +#: 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 "" -#: bookwyrm/templates/annual_summary/layout.html:104 +#: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any book in %(year)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:110 +#: bookwyrm/templates/annual_summary/layout.html:118 #, python-format -msgid "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" -msgstr "" +msgid "In %(year)s, %(display_name)s read %(books_total)s book
for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
for a total of %(pages_total)s pages!" +msgstr[0] "" -#: bookwyrm/templates/annual_summary/layout.html:112 +#: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:115 +#: bookwyrm/templates/annual_summary/layout.html:127 #, python-format msgid "That makes an average of %(pages)s pages per book." msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:120 +#: bookwyrm/templates/annual_summary/layout.html:132 #, python-format msgid "(%(no_page_number)s book doesn’t have pages)" msgid_plural "(%(no_page_number)s books don’t have pages)" msgstr[0] "" -#: bookwyrm/templates/annual_summary/layout.html:136 +#: bookwyrm/templates/annual_summary/layout.html:148 msgid "Their shortest read this year…" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:143 -#: bookwyrm/templates/annual_summary/layout.html:164 -#: bookwyrm/templates/annual_summary/layout.html:204 +#: bookwyrm/templates/annual_summary/layout.html:155 +#: bookwyrm/templates/annual_summary/layout.html:176 +#: bookwyrm/templates/annual_summary/layout.html:220 #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -339,33 +340,34 @@ msgstr "" msgid "by" msgstr "作者" -#: bookwyrm/templates/annual_summary/layout.html:149 -#: bookwyrm/templates/annual_summary/layout.html:170 +#: bookwyrm/templates/annual_summary/layout.html:161 +#: bookwyrm/templates/annual_summary/layout.html:182 #, python-format msgid "%(pages)s pages" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:169 msgid "…and the longest" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:187 +#: bookwyrm/templates/annual_summary/layout.html:199 #, python-format -msgid "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" -msgstr "" +msgid "%(display_name)s left %(ratings_total)s rating,
their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
their average rating is %(rating_average)s" +msgstr[0] "" -#: bookwyrm/templates/annual_summary/layout.html:197 +#: bookwyrm/templates/annual_summary/layout.html:213 msgid "Their best rated review" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:210 +#: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "Their rating: %(rating)s" msgstr "" -#: bookwyrm/templates/annual_summary/layout.html:227 +#: bookwyrm/templates/annual_summary/layout.html:243 #, python-format -msgid "All the books %(display_name)s read in 2021" +msgid "All the books %(display_name)s read in %(year)s" msgstr "" #: bookwyrm/templates/author/author.html:18 From a9ff23ece04d721d0cb1a71dd32344703ab85c84 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Dec 2021 13:43:28 -0800 Subject: [PATCH 24/24] Fixes nondeterministic test failure --- bookwyrm/tests/importers/test_storygraph_import.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/tests/importers/test_storygraph_import.py b/bookwyrm/tests/importers/test_storygraph_import.py index 09cf32dc1..8db459dc5 100644 --- a/bookwyrm/tests/importers/test_storygraph_import.py +++ b/bookwyrm/tests/importers/test_storygraph_import.py @@ -48,7 +48,9 @@ class StorygraphImport(TestCase): self.local_user, self.csv, False, "public" ) - import_items = models.ImportItem.objects.filter(job=import_job).all() + import_items = ( + models.ImportItem.objects.filter(job=import_job).order_by("index").all() + ) self.assertEqual(len(import_items), 2) self.assertEqual(import_items[0].index, 0) self.assertEqual(import_items[0].normalized_data["title"], "Always Coming Home")