mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-09-22 19:40:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2789 from bpeel/translatable-shelf-name

Browse source 
Fix two places where the reading status shelf name wasn’t translated
This commit is contained in:
Jascha Ezra Urbach 2023-04-15 16:59:59 +02:00 committed by GitHub
commit fadbc76aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bookwyrm/templates/book/book.html
View file

@ -4,6 +4,7 @@
{% load humanize %} {% load humanize %}
{% load utilities %} {% load utilities %}
{% load static %} {% load static %}
{% load shelf_tags %}
{% block title %}{{ book|book_title }}{% endblock %} {% block title %}{{ book|book_title }}{% endblock %}
@ -245,7 +246,7 @@
<ul> <ul>
{% for shelf in user_shelfbooks %} {% for shelf in user_shelfbooks %}
<li class="box"> <li class="box">
<a href="{{ shelf.shelf.local_path }}">{{ shelf.shelf.name }}</a> <a href="{{ shelf.shelf.local_path }}">{{ shelf.shelf|translate_shelf_name }}</a>
<div class="is-pulled-right"> <div class="is-pulled-right">
{% include 'snippets/shelf_selector.html' with shelf=shelf.shelf class="is-small" readthrough=readthrough %} {% include 'snippets/shelf_selector.html' with shelf=shelf.shelf class="is-small" readthrough=readthrough %}
</div> </div>

21
bookwyrm/templatetags/shelf_tags.py
View file

@ -9,6 +9,15 @@ from bookwyrm.utils import cache
register = template.Library() register = template.Library()
SHELF_NAMES = {
"all": _("All books"),
"to-read": _("To Read"),
"reading": _("Currently Reading"),
"read": _("Read"),
"stopped-reading": _("Stopped Reading"),
}
@register.filter(name="is_book_on_shelf") @register.filter(name="is_book_on_shelf")
def get_is_book_on_shelf(book, shelf): def get_is_book_on_shelf(book, shelf):
"""is a book on a shelf""" """is a book on a shelf"""
@ -42,14 +51,10 @@ def get_translated_shelf_name(shelf):
return "" return ""
# support obj or dict # support obj or dict
identifier = shelf["identifier"] if isinstance(shelf, dict) else shelf.identifier identifier = shelf["identifier"] if isinstance(shelf, dict) else shelf.identifier
if identifier == "all":
return _("All books") try:
if identifier == "to-read": return SHELF_NAMES[identifier]
return _("To Read") except KeyError:
if identifier == "reading":
return _("Currently Reading")
if identifier == "read":
return _("Read")
return shelf["name"] if isinstance(shelf, dict) else shelf.name return shelf["name"] if isinstance(shelf, dict) else shelf.name