yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1148 from arkhi/frontend/subtitle 

Update subtitle behaviour
This commit is contained in:
Mouse Reeve 2021-06-17 14:55:55 -07:00 committed by GitHub
parent 1f071d3c18 cc03460e00
commit 4141323783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bookwyrm/templates/book/book.html
View File

@ -8,27 +8,36 @@
<div class="block" itemscope itemtype="https://schema.org/Book"> <div class="block" itemscope itemtype="https://schema.org/Book">
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column"> <div class="column">
<h1 class="title"> <h1 class="title" itemprop="name">
<span itemprop="name"> {{ book.title }}
{{ book.title }}{% if book.subtitle %}: </h1>
<small>{{ book.subtitle }}</small>
{% endif %} {% if book.subtitle or book.series %}
<p class="subtitle title is-5">
{% if book.subtitle %}
<meta
itemprop="alternativeHeadline"
content="{{ book.subtitle | escape }}"
>
<span class="has-text-weight-bold">
{{ book.subtitle }}
</span> </span>
{% endif %}
{% if book.series %} {% if book.series %}
<meta itemprop="isPartOf" content="{{ book.series }}"> <meta itemprop="isPartOf" content="{{ book.series | escape }}">
<meta itemprop="volumeNumber" content="{{ book.series_number }}"> <meta itemprop="volumeNumber" content="{{ book.series_number }}">
<small class="has-text-grey-dark">
({{ book.series }}{% if book.series_number %} #{{ book.series_number }}{% endif %}) ({{ book.series }}{% if book.series_number %} #{{ book.series_number }}{% endif %})
</small>
<br>
{% endif %} {% endif %}
</h1> </p>
{% endif %}
{% if book.authors %} {% if book.authors %}
<h2 class="subtitle"> <div class="subtitle">
{% trans "by" %} {% include 'snippets/authors.html' with book=book %} {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
</h2> </div>
{% endif %} {% endif %}
</div> </div>
@ -84,7 +93,7 @@
<div class="column is-three-fifths"> <div class="column is-three-fifths">
<div class="block"> <div class="block">
<h3 <div
class="field is-grouped" class="field is-grouped"
itemprop="aggregateRating" itemprop="aggregateRating"
itemscope itemscope
@ -102,7 +111,7 @@
{% plural %} {% plural %}
({{ review_count }} reviews) ({{ review_count }} reviews)
{% endblocktrans %} {% endblocktrans %}
</h3> </div>
{% with full=book|book_description itemprop='abstract' %} {% with full=book|book_description itemprop='abstract' %}
{% include 'snippets/trimmed_text.html' %} {% include 'snippets/trimmed_text.html' %}

10
bookwyrm/templatetags/utilities.py
View File

@ -2,6 +2,7 @@
import os import os
from uuid import uuid4 from uuid import uuid4
from django import template from django import template
from django.utils.translation import gettext_lazy as _
register = template.Library() register = template.Library()
@ -20,13 +21,16 @@ def get_user_identifier(user):
@register.filter(name="book_title") @register.filter(name="book_title")
def get_title(book): def get_title(book, too_short=5):
"""display the subtitle if the title is short""" """display the subtitle if the title is short"""
if not book: if not book:
return "" return ""
title = book.title title = book.title
if len(title) < 6 and book.subtitle: if len(title) <= too_short and book.subtitle:
title = "{:s}: {:s}".format(title, book.subtitle) title = _("%(title)s: %(subtitle)s") % {
"title": title,
"subtitle": book.subtitle,
}
return title return title

BIN
locale/fr_FR/LC_MESSAGES/django.mo
View File

Binary file not shown.

71
locale/fr_FR/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1.1\n" "Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-07 14:09+0000\n" "POT-Creation-Date: 2021-06-09 16:46+0000\n"
"PO-Revision-Date: 2021-04-05 12:44+0100\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n"
"Last-Translator: Fabien Basmaison <contact@arkhi.org>\n" "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n" "Language-Team: Mouse Reeve <LL@li.org>\n"
@ -91,23 +91,23 @@ msgstr "nom du compte :"
msgid "A user with that username already exists." msgid "A user with that username already exists."
msgstr "Ce nom est déjà associé à un compte." msgstr "Ce nom est déjà associé à un compte."
#: bookwyrm/settings.py:160 #: bookwyrm/settings.py:156
msgid "English" msgid "English"
msgstr "English" msgstr "English"
#: bookwyrm/settings.py:161 #: bookwyrm/settings.py:157
msgid "German" msgid "German"
msgstr "Deutsch" msgstr "Deutsch"
#: bookwyrm/settings.py:162 #: bookwyrm/settings.py:158
msgid "Spanish" msgid "Spanish"
msgstr "Español" msgstr "Español"
#: bookwyrm/settings.py:163 #: bookwyrm/settings.py:159
msgid "French" msgid "French"
msgstr "Français" msgstr "Français"
#: bookwyrm/settings.py:164 #: bookwyrm/settings.py:160
msgid "Simplified Chinese" msgid "Simplified Chinese"
msgstr "简化字" msgstr "简化字"
@ -154,12 +154,12 @@ msgid "Wikipedia"
msgstr "Wikipedia" msgstr "Wikipedia"
#: bookwyrm/templates/author/author.html:69 #: bookwyrm/templates/author/author.html:69
#: bookwyrm/templates/book/book.html:78 #: bookwyrm/templates/book/book.html:87
msgid "View on OpenLibrary" msgid "View on OpenLibrary"
msgstr "Voir sur OpenLibrary" msgstr "Voir sur OpenLibrary"
#: bookwyrm/templates/author/author.html:77 #: bookwyrm/templates/author/author.html:77
#: bookwyrm/templates/book/book.html:81 #: bookwyrm/templates/book/book.html:90
msgid "View on Inventaire" msgid "View on Inventaire"
msgstr "Voir sur Inventaire" msgstr "Voir sur Inventaire"
@ -252,7 +252,7 @@ msgid "Goodreads key:"
msgstr "Clé Goodreads :" msgstr "Clé Goodreads :"
#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/book/book.html:124 #: bookwyrm/templates/book/book.html:133
#: bookwyrm/templates/book/edit_book.html:321 #: bookwyrm/templates/book/edit_book.html:321
#: bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:70 #: bookwyrm/templates/preferences/edit_user.html:70
@ -269,7 +269,7 @@ msgid "Save"
msgstr "Enregistrer" msgstr "Enregistrer"
#: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/author/edit_author.html:117
#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 #: bookwyrm/templates/book/book.html:134 bookwyrm/templates/book/book.html:183
#: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/cover_modal.html:32
#: bookwyrm/templates/book/edit_book.html:322 #: bookwyrm/templates/book/edit_book.html:322
#: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/moderation/report_modal.html:34
@ -284,98 +284,98 @@ msgstr "Enregistrer"
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
#: bookwyrm/templates/book/book.html:31 #: bookwyrm/templates/book/book.html:40
#: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/large-book.html:25
#: bookwyrm/templates/discover/small-book.html:19 #: bookwyrm/templates/discover/small-book.html:19
msgid "by" msgid "by"
msgstr "par" msgstr "par"
#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 #: bookwyrm/templates/book/book.html:48 bookwyrm/templates/book/book.html:49
msgid "Edit Book" msgid "Edit Book"
msgstr "Modifier le livre" msgstr "Modifier le livre"
#: bookwyrm/templates/book/book.html:57 #: bookwyrm/templates/book/book.html:66
#: bookwyrm/templates/book/cover_modal.html:5 #: bookwyrm/templates/book/cover_modal.html:5
msgid "Add cover" msgid "Add cover"
msgstr "Ajouter une couverture" msgstr "Ajouter une couverture"
#: bookwyrm/templates/book/book.html:61 #: bookwyrm/templates/book/book.html:70
msgid "Failed to load cover" msgid "Failed to load cover"
msgstr "La couverture n’a pu être chargée" msgstr "La couverture n’a pu être chargée"
#: bookwyrm/templates/book/book.html:101 #: bookwyrm/templates/book/book.html:110
#, python-format #, python-format
msgid "(%(review_count)s review)" msgid "(%(review_count)s review)"
msgid_plural "(%(review_count)s reviews)" msgid_plural "(%(review_count)s reviews)"
msgstr[0] "(%(review_count)s critique)" msgstr[0] "(%(review_count)s critique)"
msgstr[1] "(%(review_count)s critiques)" msgstr[1] "(%(review_count)s critiques)"
#: bookwyrm/templates/book/book.html:113 #: bookwyrm/templates/book/book.html:122
msgid "Add Description" msgid "Add Description"
msgstr "Ajouter une description" msgstr "Ajouter une description"
#: bookwyrm/templates/book/book.html:120 #: bookwyrm/templates/book/book.html:129
#: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/book/edit_book.html:136
#: bookwyrm/templates/lists/form.html:12 #: bookwyrm/templates/lists/form.html:12
msgid "Description:" msgid "Description:"
msgstr "Description :" msgstr "Description :"
#: bookwyrm/templates/book/book.html:134 #: bookwyrm/templates/book/book.html:143
#, python-format #, python-format
msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>" msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>" msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
#: bookwyrm/templates/book/book.html:142 #: bookwyrm/templates/book/book.html:151
#, python-format #, python-format
msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf." msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>." msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
#: bookwyrm/templates/book/book.html:148 #: bookwyrm/templates/book/book.html:157
#, python-format #, python-format
msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf." msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>." msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
#: bookwyrm/templates/book/book.html:159 #: bookwyrm/templates/book/book.html:168
msgid "Your reading activity" msgid "Your reading activity"
msgstr "Votre activité de lecture" msgstr "Votre activité de lecture"
#: bookwyrm/templates/book/book.html:162 #: bookwyrm/templates/book/book.html:171
msgid "Add read dates" msgid "Add read dates"
msgstr "Ajouter des dates de lecture" msgstr "Ajouter des dates de lecture"
#: bookwyrm/templates/book/book.html:171 #: bookwyrm/templates/book/book.html:180
msgid "Create" msgid "Create"
msgstr "Créer" msgstr "Créer"
#: bookwyrm/templates/book/book.html:181 #: bookwyrm/templates/book/book.html:190
msgid "You don't have any reading activity for this book." msgid "You don't have any reading activity for this book."
msgstr "Vous n’avez aucune activité de lecture pour ce livre" msgstr "Vous n’avez aucune activité de lecture pour ce livre"
#: bookwyrm/templates/book/book.html:200 #: bookwyrm/templates/book/book.html:209
msgid "Reviews" msgid "Reviews"
msgstr "Critiques" msgstr "Critiques"
#: bookwyrm/templates/book/book.html:205 #: bookwyrm/templates/book/book.html:214
msgid "Your reviews" msgid "Your reviews"
msgstr "Vos critiques" msgstr "Vos critiques"
#: bookwyrm/templates/book/book.html:211 #: bookwyrm/templates/book/book.html:220
msgid "Your comments" msgid "Your comments"
msgstr "Vos commentaires" msgstr "Vos commentaires"
#: bookwyrm/templates/book/book.html:217 #: bookwyrm/templates/book/book.html:226
msgid "Your quotes" msgid "Your quotes"
msgstr "Vos citations" msgstr "Vos citations"
#: bookwyrm/templates/book/book.html:253 #: bookwyrm/templates/book/book.html:262
msgid "Subjects" msgid "Subjects"
msgstr "Sujets" msgstr "Sujets"
#: bookwyrm/templates/book/book.html:265 #: bookwyrm/templates/book/book.html:274
msgid "Places" msgid "Places"
msgstr "Lieux" msgstr "Lieux"
#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 #: bookwyrm/templates/book/book.html:285 bookwyrm/templates/layout.html:61
#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
#: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:25
#: bookwyrm/templates/search/layout.html:50 #: bookwyrm/templates/search/layout.html:50
@ -383,11 +383,11 @@ msgstr "Lieux"
msgid "Lists" msgid "Lists"
msgstr "Listes" msgstr "Listes"
#: bookwyrm/templates/book/book.html:287 #: bookwyrm/templates/book/book.html:296
msgid "Add to list" msgid "Add to list"
msgstr "Ajouter à la liste" msgstr "Ajouter à la liste"
#: bookwyrm/templates/book/book.html:297 #: bookwyrm/templates/book/book.html:306
#: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/book/cover_modal.html:31
#: bookwyrm/templates/lists/list.html:179 #: bookwyrm/templates/lists/list.html:179
msgid "Add" msgid "Add"
@ -2921,6 +2921,11 @@ msgstr "Niveau d’accès :"
msgid "File exceeds maximum size: 10MB" msgid "File exceeds maximum size: 10MB"
msgstr "Ce fichier dépasse la taille limite : 10 Mo" msgstr "Ce fichier dépasse la taille limite : 10 Mo"
#: bookwyrm/templatetags/utilities.py:30
#, python-format
msgid "%(title)s: %(subtitle)s"
msgstr "%(title)s (%(subtitle)s)"
#: bookwyrm/views/import_data.py:67 #: bookwyrm/views/import_data.py:67
msgid "Not a valid csv file" msgid "Not a valid csv file"
msgstr "Fichier CSV non valide" msgstr "Fichier CSV non valide"