From 5d4efd457a9ac404334948bd1e271b5e26f07486 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 25 Feb 2022 12:39:44 -0800 Subject: [PATCH 01/12] Removes scrollIntoView script behavior for tabs --- bookwyrm/static/js/vendor/tabs.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bookwyrm/static/js/vendor/tabs.js b/bookwyrm/static/js/vendor/tabs.js index 0535cc86..884fb08f 100644 --- a/bookwyrm/static/js/vendor/tabs.js +++ b/bookwyrm/static/js/vendor/tabs.js @@ -56,10 +56,6 @@ class TabGroup { tab.addEventListener('keydown', this.keydownEventListener.bind(this)); tab.addEventListener('keyup', this.keyupEventListener.bind(this)); - if (isSelected) { - tab.scrollIntoView(); - } - tab.index = count++; } } From cec7625e1eed97ab3259735a6dcd8c354f69ac0a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 25 Feb 2022 12:47:46 -0800 Subject: [PATCH 02/12] Moves tabs script to main scripts directory It's our own custom script at this point --- bookwyrm/static/js/{vendor => }/tabs.js | 0 bookwyrm/templates/book/book.html | 2 +- bookwyrm/templates/feed/layout.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/static/js/{vendor => }/tabs.js (100%) diff --git a/bookwyrm/static/js/vendor/tabs.js b/bookwyrm/static/js/tabs.js similarity index 100% rename from bookwyrm/static/js/vendor/tabs.js rename to bookwyrm/static/js/tabs.js diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index e15b656c..60e3d4fd 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -386,6 +386,6 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/bookwyrm/templates/feed/layout.html b/bookwyrm/templates/feed/layout.html index 5697f266..5083c0ab 100644 --- a/bookwyrm/templates/feed/layout.html +++ b/bookwyrm/templates/feed/layout.html @@ -31,5 +31,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} From 65bd3945e70db3224ce953e4b0acea6db0f288e5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 25 Feb 2022 12:52:35 -0800 Subject: [PATCH 03/12] Prettify tabs file --- bookwyrm/static/js/tabs.js | 72 ++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js index 884fb08f..f284e548 100644 --- a/bookwyrm/static/js/tabs.js +++ b/bookwyrm/static/js/tabs.js @@ -1,11 +1,11 @@ /* exported TabGroup */ /* -* The content below is licensed according to the W3C Software License at -* https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document -* Heavily modified to web component by Zach Leatherman -* Modified back to vanilla JavaScript with support for Bulma markup and nested tabs by Ned Zimmerman -*/ + * The content below is licensed according to the W3C Software License at + * https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document + * Heavily modified to web component by Zach Leatherman + * Modified back to vanilla JavaScript with support for Bulma markup and nested tabs by Ned Zimmerman + */ class TabGroup { constructor(container) { this.container = container; @@ -15,7 +15,7 @@ class TabGroup { this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]'); this.delay = this.determineDelay(); - if(!this.tablist || !this.tabs.length || !this.panels.length) { + if (!this.tablist || !this.tabs.length || !this.panels.length) { return; } @@ -32,7 +32,7 @@ class TabGroup { left: 37, up: 38, right: 39, - down: 40 + down: 40, }; } @@ -42,19 +42,19 @@ class TabGroup { 37: -1, 38: -1, 39: 1, - 40: 1 + 40: 1, }; } initTabs() { let count = 0; - for(let tab of this.tabs) { + for (let tab of this.tabs) { let isSelected = tab.getAttribute("aria-selected") === "true"; tab.setAttribute("tabindex", isSelected ? "0" : "-1"); - tab.addEventListener('click', this.clickEventListener.bind(this)); - tab.addEventListener('keydown', this.keydownEventListener.bind(this)); - tab.addEventListener('keyup', this.keyupEventListener.bind(this)); + tab.addEventListener("click", this.clickEventListener.bind(this)); + tab.addEventListener("keydown", this.keydownEventListener.bind(this)); + tab.addEventListener("keyup", this.keyupEventListener.bind(this)); tab.index = count++; } @@ -64,8 +64,8 @@ class TabGroup { let selectedPanelId = this.tablist .querySelector('[role="tab"][aria-selected="true"]') .getAttribute("aria-controls"); - for(let panel of this.panels) { - if(panel.getAttribute("id") !== selectedPanelId) { + for (let panel of this.panels) { + if (panel.getAttribute("id") !== selectedPanelId) { panel.setAttribute("hidden", ""); } panel.setAttribute("tabindex", "0"); @@ -122,7 +122,7 @@ class TabGroup { // In all other cases only left and right arrow function. determineOrientation(event) { var key = event.keyCode; - var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical'; + var vertical = this.tablist.getAttribute("aria-orientation") == "vertical"; var proceed = false; if (vertical) { @@ -130,8 +130,7 @@ class TabGroup { event.preventDefault(); proceed = true; } - } - else { + } else { if (key === this.keys.left || key === this.keys.right) { proceed = true; } @@ -148,7 +147,7 @@ class TabGroup { var pressed = event.keyCode; for (let tab of this.tabs) { - tab.addEventListener('focus', this.focusEventHandler.bind(this)); + tab.addEventListener("focus", this.focusEventHandler.bind(this)); } if (this.direction[pressed]) { @@ -156,11 +155,9 @@ class TabGroup { if (target.index !== undefined) { if (this.tabs[target.index + this.direction[pressed]]) { this.tabs[target.index + this.direction[pressed]].focus(); - } - else if (pressed === this.keys.left || pressed === this.keys.up) { + } else if (pressed === this.keys.left || pressed === this.keys.up) { this.focusLastTab(); - } - else if (pressed === this.keys.right || pressed == this.keys.down) { + } else if (pressed === this.keys.right || pressed == this.keys.down) { this.focusFirstTab(); } } @@ -168,8 +165,8 @@ class TabGroup { } // Activates any given tab panel - activateTab (tab, setFocus) { - if(tab.getAttribute("role") !== "tab") { + activateTab(tab, setFocus) { + if (tab.getAttribute("role") !== "tab") { tab = tab.closest('[role="tab"]'); } @@ -179,19 +176,19 @@ class TabGroup { this.deactivateTabs(); // Remove tabindex attribute - tab.removeAttribute('tabindex'); + tab.removeAttribute("tabindex"); // Set the tab as selected - tab.setAttribute('aria-selected', 'true'); + tab.setAttribute("aria-selected", "true"); // Give the tab is-active class - tab.classList.add('is-active'); + tab.classList.add("is-active"); // Get the value of aria-controls (which is an ID) - var controls = tab.getAttribute('aria-controls'); + var controls = tab.getAttribute("aria-controls"); // Remove hidden attribute from tab panel to make it visible - document.getElementById(controls).removeAttribute('hidden'); + document.getElementById(controls).removeAttribute("hidden"); // Set focus when required if (setFocus) { @@ -202,14 +199,14 @@ class TabGroup { // Deactivate all tabs and tab panels deactivateTabs() { for (let tab of this.tabs) { - tab.classList.remove('is-active'); - tab.setAttribute('tabindex', '-1'); - tab.setAttribute('aria-selected', 'false'); - tab.removeEventListener('focus', this.focusEventHandler.bind(this)); + tab.classList.remove("is-active"); + tab.setAttribute("tabindex", "-1"); + tab.setAttribute("aria-selected", "false"); + tab.removeEventListener("focus", this.focusEventHandler.bind(this)); } for (let panel of this.panels) { - panel.setAttribute('hidden', 'hidden'); + panel.setAttribute("hidden", "hidden"); } } @@ -224,15 +221,14 @@ class TabGroup { // Determine whether there should be a delay // when user navigates with the arrow keys determineDelay() { - var hasDelay = this.tablist.hasAttribute('data-delay'); + var hasDelay = this.tablist.hasAttribute("data-delay"); var delay = 0; if (hasDelay) { - var delayValue = this.tablist.getAttribute('data-delay'); + var delayValue = this.tablist.getAttribute("data-delay"); if (delayValue) { delay = delayValue; - } - else { + } else { // If no value is specified, default to 300ms delay = 300; } From 02808f88e6888230704f193f3238648dbee072f2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 25 Feb 2022 12:59:49 -0800 Subject: [PATCH 04/12] eslint fixes --- bookwyrm/settings.py | 2 +- bookwyrm/static/js/tabs.js | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 7a37499e..0fbe3b73 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -21,7 +21,7 @@ RELEASE_API = env( PAGE_LENGTH = env("PAGE_LENGTH", 15) DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English") -JS_CACHE = "a60e5a55" +JS_CACHE = "c7144efb" # email EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend") diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js index f284e548..1dcb0cac 100644 --- a/bookwyrm/static/js/tabs.js +++ b/bookwyrm/static/js/tabs.js @@ -48,8 +48,10 @@ class TabGroup { initTabs() { let count = 0; + for (let tab of this.tabs) { let isSelected = tab.getAttribute("aria-selected") === "true"; + tab.setAttribute("tabindex", isSelected ? "0" : "-1"); tab.addEventListener("click", this.clickEventListener.bind(this)); @@ -64,6 +66,7 @@ class TabGroup { let selectedPanelId = this.tablist .querySelector('[role="tab"][aria-selected="true"]') .getAttribute("aria-controls"); + for (let panel of this.panels) { if (panel.getAttribute("id") !== selectedPanelId) { panel.setAttribute("hidden", ""); @@ -82,16 +85,18 @@ class TabGroup { // Handle keydown on tabs keydownEventListener(event) { - var key = event.keyCode; + const key = event.keyCode; switch (key) { case this.keys.end: event.preventDefault(); + // Activate last tab this.activateTab(this.tabs[this.tabs.length - 1]); break; case this.keys.home: event.preventDefault(); + // Activate first tab this.activateTab(this.tabs[0]); break; @@ -107,7 +112,7 @@ class TabGroup { // Handle keyup on tabs keyupEventListener(event) { - var key = event.keyCode; + const key = event.keyCode; switch (key) { case this.keys.left: @@ -121,9 +126,9 @@ class TabGroup { // only up and down arrow should function. // In all other cases only left and right arrow function. determineOrientation(event) { - var key = event.keyCode; - var vertical = this.tablist.getAttribute("aria-orientation") == "vertical"; - var proceed = false; + const key = event.keyCode; + const vertical = this.tablist.getAttribute("aria-orientation") == "vertical"; + let proceed = false; if (vertical) { if (key === this.keys.up || key === this.keys.down) { @@ -144,14 +149,15 @@ class TabGroup { // Either focus the next, previous, first, or last tab // depending on key pressed switchTabOnArrowPress(event) { - var pressed = event.keyCode; + const pressed = event.keyCode; for (let tab of this.tabs) { tab.addEventListener("focus", this.focusEventHandler.bind(this)); } if (this.direction[pressed]) { - var target = event.target; + const target = event.target; + if (target.index !== undefined) { if (this.tabs[target.index + this.direction[pressed]]) { this.tabs[target.index + this.direction[pressed]].focus(); @@ -185,7 +191,7 @@ class TabGroup { tab.classList.add("is-active"); // Get the value of aria-controls (which is an ID) - var controls = tab.getAttribute("aria-controls"); + const controls = tab.getAttribute("aria-controls"); // Remove hidden attribute from tab panel to make it visible document.getElementById(controls).removeAttribute("hidden"); @@ -221,11 +227,12 @@ class TabGroup { // Determine whether there should be a delay // when user navigates with the arrow keys determineDelay() { - var hasDelay = this.tablist.hasAttribute("data-delay"); - var delay = 0; + const hasDelay = this.tablist.hasAttribute("data-delay"); + let delay = 0; if (hasDelay) { - var delayValue = this.tablist.getAttribute("data-delay"); + const delayValue = this.tablist.getAttribute("data-delay"); + if (delayValue) { delay = delayValue; } else { @@ -238,7 +245,7 @@ class TabGroup { } focusEventHandler(event) { - var target = event.target; + const target = event.target; setTimeout(this.checkTabFocus.bind(this), this.delay, target); } From 202696f913e8cd4b2b347cb2e9b958e1d0f65866 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 10:03:24 -0800 Subject: [PATCH 05/12] Don't show lists a book is already on in add form --- bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/views/books/books.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 60e3d4fd..0e2fd5d3 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -352,7 +352,7 @@ {% endfor %} - {% if request.user.list_set.exists %} + {% if list_options.exists %}
{% csrf_token %} @@ -361,7 +361,7 @@
diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index e04230ba..ad7ee943 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -83,6 +83,7 @@ class Book(View): } if request.user.is_authenticated: + data["list_options"] = request.user.list_set.exclude(id__in=data["lists"]) data["file_link_form"] = forms.FileLinkForm() readthroughs = models.ReadThrough.objects.filter( user=request.user, From b2b3ba653e1d1139ac36e51d38541c0c9cd83a46 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 10:29:58 -0800 Subject: [PATCH 06/12] Refactors how success/failure messages how on list page --- bookwyrm/templates/lists/list.html | 25 ++++++++++++++++++------- bookwyrm/views/list/list.py | 23 ++++++++--------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 1c26733d..73ea7dba 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -30,13 +30,24 @@
- {% if request.GET.updated %} -
- {% if list.curation != "open" and request.user != list.user and not list.group|is_member:request.user %} - {% trans "You successfully suggested a book for this list!" %} - {% else %} - {% trans "You successfully added a book to this list!" %} - {% endif %} + {% if add_succeeded %} +
+ + + {% if list.curation != "open" and request.user != list.user and not list.group|is_member:request.user %} + {% trans "You successfully suggested a book for this list!" %} + {% else %} + {% trans "You successfully added a book to this list!" %} + {% endif %} + +
+ {% endif %} + {% if add_failed %} +
+ + + {% trans "That book is already on this list." %} +
{% endif %} diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index fbbbee9f..0b228200 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -1,11 +1,10 @@ """ book list views""" from typing import Optional -from urllib.parse import urlencode from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator -from django.db import IntegrityError, transaction +from django.db import transaction from django.db.models import Avg, DecimalField, Q, Max from django.db.models.functions import Coalesce from django.http import HttpResponseBadRequest, HttpResponse @@ -26,7 +25,7 @@ from bookwyrm.views.helpers import is_api_request class List(View): """book list page""" - def get(self, request, list_id): + def get(self, request, list_id, add_failed=False, add_succeeded=True): """display a book list""" book_list = get_object_or_404(models.List, id=list_id) book_list.raise_visible_to_user(request.user) @@ -110,6 +109,8 @@ class List(View): {"direction": direction, "sort_by": sort_by} ), "embed_url": embed_url, + "add_failed": add_failed, + "add_succeeded": add_succeeded, } return TemplateResponse(request, "lists/list.html", data) @@ -179,8 +180,8 @@ def add_book(request): form = forms.ListItemForm(request.POST) if not form.is_valid(): - # this shouldn't happen, there aren't validated fields - raise Exception(form.errors) + return List().get(request, book_list.id, add_failed=True) + item = form.save(commit=False) if book_list.curation == "curated": @@ -196,17 +197,9 @@ def add_book(request): ) or 0 increment_order_in_reverse(book_list.id, order_max + 1) item.order = order_max + 1 + item.save() - try: - item.save() - except IntegrityError: - # if the book is already on the list, don't flip out - pass - - path = reverse("list", args=[book_list.id]) - params = request.GET.copy() - params["updated"] = True - return redirect(f"{path}?{urlencode(params)}") + return List().get(request, book_list.id, add_succeeded=True) @require_POST From 99fc3aaf25873eca683f8db6e2b3eee7c2448f2a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 10:31:58 -0800 Subject: [PATCH 07/12] Avoid showing success and failure --- bookwyrm/templates/lists/list.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 73ea7dba..1d5abd89 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -30,7 +30,14 @@
- {% if add_succeeded %} + {% if add_failed %} +
+ + + {% trans "That book is already on this list." %} + +
+ {% elif add_succeeded %}
@@ -42,14 +49,6 @@
{% endif %} - {% if add_failed %} -
- - - {% trans "That book is already on this list." %} - -
- {% endif %} {% if not items.object_list.exists %}

{% trans "This list is currently empty" %}

From 142cc5437ae6f874e2cebe26cf9dfa7e883f26c2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 10:41:40 -0800 Subject: [PATCH 08/12] Move sorting to separate function --- bookwyrm/views/list/list.py | 67 ++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 0b228200..dc1843fa 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -25,7 +25,7 @@ from bookwyrm.views.helpers import is_api_request class List(View): """book list page""" - def get(self, request, list_id, add_failed=False, add_succeeded=True): + def get(self, request, list_id, add_failed=False, add_succeeded=False): """display a book list""" book_list = get_object_or_404(models.List, id=list_id) book_list.raise_visible_to_user(request.user) @@ -36,33 +36,10 @@ class List(View): query = request.GET.get("q") suggestions = None - # sort_by shall be "order" unless a valid alternative is given - sort_by = request.GET.get("sort_by", "order") - if sort_by not in ("order", "title", "rating"): - sort_by = "order" - - # direction shall be "ascending" unless a valid alternative is given - direction = request.GET.get("direction", "ascending") - if direction not in ("ascending", "descending"): - direction = "ascending" - - directional_sort_by = { - "order": "order", - "title": "book__title", - "rating": "average_rating", - }[sort_by] - if direction == "descending": - directional_sort_by = "-" + directional_sort_by - - items = book_list.listitem_set.prefetch_related("user", "book", "book__authors") - if sort_by == "rating": - items = items.annotate( - average_rating=Avg( - Coalesce("book__review__rating", 0.0), - output_field=DecimalField(), - ) - ) - items = items.filter(approved=True).order_by(directional_sort_by) + items = book_list.listitem_set.filter(approved=True).prefetch_related( + "user", "book", "book__authors" + ) + items = sort_list(request, items) paginated = Paginator(items, PAGE_LENGTH) @@ -105,9 +82,7 @@ class List(View): "suggested_books": suggestions, "list_form": forms.ListForm(instance=book_list), "query": query or "", - "sort_form": forms.SortListForm( - {"direction": direction, "sort_by": sort_by} - ), + "sort_form": forms.SortListForm(request.GET), "embed_url": embed_url, "add_failed": add_failed, "add_succeeded": add_succeeded, @@ -132,6 +107,36 @@ class List(View): return redirect(book_list.local_path) +def sort_list(request, items): + """helper to handle the surprisngly involved sorting""" + # sort_by shall be "order" unless a valid alternative is given + sort_by = request.GET.get("sort_by", "order") + if sort_by not in ("order", "title", "rating"): + sort_by = "order" + + # direction shall be "ascending" unless a valid alternative is given + direction = request.GET.get("direction", "ascending") + if direction not in ("ascending", "descending"): + direction = "ascending" + + directional_sort_by = { + "order": "order", + "title": "book__title", + "rating": "average_rating", + }[sort_by] + if direction == "descending": + directional_sort_by = "-" + directional_sort_by + + if sort_by == "rating": + items = items.annotate( + average_rating=Avg( + Coalesce("book__review__rating", 0.0), + output_field=DecimalField(), + ) + ) + return items.order_by(directional_sort_by) + + @require_POST @login_required def save_list(request, list_id): From 374dd24fa839fd1e6712e3d68936ebaf53a50423 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 10:47:08 -0800 Subject: [PATCH 09/12] Remove reviews from deleted users --- bookwyrm/models/status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 29b3ba9c..17fcd458 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -227,7 +227,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): @classmethod def privacy_filter(cls, viewer, privacy_levels=None): queryset = super().privacy_filter(viewer, privacy_levels=privacy_levels) - return queryset.filter(deleted=False) + return queryset.filter(deleted=False, user__is_active=True) @classmethod def direct_filter(cls, queryset, viewer): From 0f5fd6be155533000ca35ec12970cb1afc6144e9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 11:05:12 -0800 Subject: [PATCH 10/12] Move translations to filter --- .../snippets/translated_shelf_name.html | 14 +++----------- bookwyrm/templatetags/shelf_tags.py | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/bookwyrm/templates/snippets/translated_shelf_name.html b/bookwyrm/templates/snippets/translated_shelf_name.html index 4da47e37..966135f5 100644 --- a/bookwyrm/templates/snippets/translated_shelf_name.html +++ b/bookwyrm/templates/snippets/translated_shelf_name.html @@ -1,12 +1,4 @@ {% load i18n %} -{% if shelf.identifier == 'all' %} - {% trans "All books" %} -{% elif shelf.identifier == 'to-read' %} - {% trans "To Read" %} -{% elif shelf.identifier == 'reading' %} - {% trans "Currently Reading" %} -{% elif shelf.identifier == 'read' %} - {% trans "Read" %} -{% else %} - {{ shelf.name }} -{% endif %} +{% load shelf_tags %} + +{{ shelf|translate_shelf_name }} diff --git a/bookwyrm/templatetags/shelf_tags.py b/bookwyrm/templatetags/shelf_tags.py index 6c4f59c3..a2788826 100644 --- a/bookwyrm/templatetags/shelf_tags.py +++ b/bookwyrm/templatetags/shelf_tags.py @@ -1,5 +1,6 @@ """ Filters and tags related to shelving books """ from django import template +from django.utils.translation import gettext_lazy as _ from bookwyrm import models from bookwyrm.utils import cache @@ -32,6 +33,23 @@ def get_next_shelf(current_shelf): return "to-read" +@register.filter(name="translate_shelf_name") +def get_translated_shelf_name(shelf): + """produced translated shelf nidentifierame""" + if not shelf: + return "" + identifier = shelf.identifier + if identifier == "all": + return _("All books") + if identifier == "to-read": + return _("To Read") + if identifier == "reading": + return _("Currently Reading") + if identifier == "read": + return _("Read") + return shelf.name + + @register.simple_tag(takes_context=True) def active_shelf(context, book): """check what shelf a user has a book on, if any""" From ffb4098cfb565423deeec5b2bf7e2e6ecef0ed63 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 11:07:12 -0800 Subject: [PATCH 11/12] Fixes translation of "remove from shelf" string --- bookwyrm/templates/snippets/shelf_selector.html | 4 +++- .../shelve_button/shelve_button_dropdown_options.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html index 4b3ad4bd..a5f768a7 100644 --- a/bookwyrm/templates/snippets/shelf_selector.html +++ b/bookwyrm/templates/snippets/shelf_selector.html @@ -71,7 +71,9 @@ {% csrf_token %} - + {% endif %} 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 1fa26a88..75dad0c8 100644 --- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html +++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html @@ -63,7 +63,7 @@ From 7d6032e1102956758c32fe7a7348abcb0beef0c7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Feb 2022 11:17:52 -0800 Subject: [PATCH 12/12] Fixes calls to filter --- bookwyrm/templates/snippets/shelf_selector.html | 2 +- .../shelve_button/shelve_button_dropdown_options.html | 2 +- bookwyrm/templatetags/shelf_tags.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html index a5f768a7..2d1f2a83 100644 --- a/bookwyrm/templates/snippets/shelf_selector.html +++ b/bookwyrm/templates/snippets/shelf_selector.html @@ -72,7 +72,7 @@ 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 75dad0c8..2b87e21f 100644 --- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html +++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html @@ -63,7 +63,7 @@ diff --git a/bookwyrm/templatetags/shelf_tags.py b/bookwyrm/templatetags/shelf_tags.py index a2788826..4c15786a 100644 --- a/bookwyrm/templatetags/shelf_tags.py +++ b/bookwyrm/templatetags/shelf_tags.py @@ -38,7 +38,8 @@ def get_translated_shelf_name(shelf): """produced translated shelf nidentifierame""" if not shelf: return "" - identifier = shelf.identifier + # support obj or dict + identifier = shelf["identifier"] if isinstance(shelf, dict) else shelf.identifier if identifier == "all": return _("All books") if identifier == "to-read": @@ -47,7 +48,7 @@ def get_translated_shelf_name(shelf): return _("Currently Reading") if identifier == "read": return _("Read") - return shelf.name + return shelf["name"] if isinstance(shelf, dict) else shelf.name @register.simple_tag(takes_context=True)