Merge branch 'main' into book-file-links

bookwyrm/templates/snippets/generated_status/review_pure_name.html

@@ -1,10 +1,16 @@
 {% load i18n %}
 {% if rating %}
 
-{% blocktrans with book_title=book.title|safe display_rating=rating|floatformat:"-1" review_title=name|safe count counter=rating %}Review of "{{ book_title }}" ({{ display_rating }} star): {{ review_title }}{% plural %}Review of "{{ book_title }}" ({{ display_rating }} stars): {{ review_title }}{% endblocktrans %}
+{% blocktrans trimmed with book_title=book.title|safe book_path=book.local_path display_rating=rating|floatformat:"-1" review_title=name|safe count counter=rating %}
+Review of "<a href='{{ book_path }}'>{{ book_title }}</a>" ({{ display_rating }} star): {{ review_title }}
+{% plural %}
+Review of "<a href='{{ book_path }}'>{{ book_title }}</a>" ({{ display_rating }} stars): {{ review_title }}
+{% endblocktrans %}
 
 {% else %}
 
-{% blocktrans with book_title=book.title|safe review_title=name|safe %}Review of "{{ book_title }}": {{ review_title }}{% endblocktrans %}
+{% blocktrans trimmed with book_title=book.title|safe book_path=book.local_path review_title=name|safe %}
+Review of "<a href='{{ book_path }}'>{{ book_title }}</a>": {{ review_title }}
+{% endblocktrans %}
 
 {% endif %}

bookwyrm/templates/snippets/status/headers/comment.html

@@ -1,2 +1,20 @@
-{% load i18n %}{% load utilities %}
-{% blocktrans with book_path=status.book.local_path book=status.book|book_title %}commented on <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% load i18n %}
+{% load utilities %}
+
+{% with book=status.book %}
+{% if book.authors.exists %}
+
+{% with author=book.authors.first %}
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title author_name=author.name author_path=author.local_path %}
+commented on <a href="{{ book_path }}">{{ book }}</a> by <a href="{{ author_path }}">{{ author_name }}</a>
+{% endblocktrans %}
+{% endwith %}
+
+{% else %}
+
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title %}
+commented on <a href="{{ book_path }}">{{ book }}</a>
+{% endblocktrans %}
+
+{% endif %}
+{% endwith %}

bookwyrm/templates/snippets/status/headers/quotation.html

@@ -1,2 +1,20 @@
-{% load i18n %}{% load utilities %}
-{% blocktrans with book_path=status.book.local_path book=status.book|book_title %}quoted <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% load i18n %}
+{% load utilities %}
+
+{% with book=status.book %}
+{% if book.authors.exists %}
+
+{% with author=book.authors.first %}
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title author_name=author.name author_path=author.local_path %}
+quoted <a href="{{ book_path }}">{{ book }}</a> by <a href="{{ author_path }}">{{ author_name }}</a>
+{% endblocktrans %}
+{% endwith %}
+
+{% else %}
+
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title %}
+quoted <a href="{{ book_path }}">{{ book }}</a>
+{% endblocktrans %}
+
+{% endif %}
+{% endwith %}

bookwyrm/templates/snippets/status/headers/read.html

@@ -4,5 +4,19 @@
 {% load status_display %}
 
 {% load_book status as book %}
-{% blocktrans with book_path=book.remote_id book=book|book_title %}finished reading <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% if book.authors.exists %}
+
+{% with author=book.authors.first %}
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title author_name=author.name author_path=author.local_path %}
+finished reading <a href="{{ book_path }}">{{ book }}</a> by <a href="{{ author_path }}">{{ author_name }}</a>
+{% endblocktrans %}
+{% endwith %}
+
+{% else %}
+
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title %}
+finished reading <a href="{{ book_path }}">{{ book }}</a>
+{% endblocktrans %}
+
+{% endif %}
 {% endspaceless %}

bookwyrm/templates/snippets/status/headers/reading.html

@@ -4,5 +4,19 @@
 {% load status_display %}
 
 {% load_book status as book %}
-{% blocktrans with book_path=book.remote_id book=book|book_title %}started reading <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% if book.authors.exists %}
+
+{% with author=book.authors.first %}
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title author_name=author.name author_path=author.local_path %}
+started reading <a href="{{ book_path }}">{{ book }}</a> by <a href="{{ author_path }}">{{ author_name }}</a>
+{% endblocktrans %}
+{% endwith %}
+
+{% else %}
+
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title %}
+started reading <a href="{{ book_path }}">{{ book }}</a>
+{% endblocktrans %}
+
+{% endif %}
 {% endspaceless %}

bookwyrm/templates/snippets/status/headers/review.html

@@ -1,3 +1,20 @@
-{% load i18n %}{% load utilities %}
+{% load i18n %}
+{% load utilities %}
 
-{% blocktrans with book_path=status.book.local_path book=status.book|book_title %}reviewed <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% with book=status.book %}
+{% if book.authors.exists %}
+
+{% with author=book.authors.first %}
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title author_name=author.name author_path=author.local_path %}
+reviewed <a href="{{ book_path }}">{{ book }}</a> by <a href="{{ author_path }}">{{ author_name }}</a>
+{% endblocktrans %}
+{% endwith %}
+
+{% else %}
+
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title %}
+reviewed <a href="{{ book_path }}">{{ book }}</a>
+{% endblocktrans %}
+
+{% endif %}
+{% endwith %}

bookwyrm/templates/snippets/status/headers/to_read.html

@@ -4,5 +4,19 @@
 {% load status_display %}
 
 {% load_book status as book %}
-{% blocktrans with book_path=book.remote_id book=book|book_title %}<a href="{{ user_path }}">{{ username }}</a> wants to read <a href="{{ book_path }}">{{ book }}</a>{% endblocktrans %}
+{% if book.authors.exists %}
+
+{% with author=book.authors.first %}
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title author_name=author.name author_path=author.local_path %}
+wants to read <a href="{{ book_path }}">{{ book }}</a> by <a href="{{ author_path }}">{{ author_name }}</a>
+{% endblocktrans %}
+{% endwith %}
+
+{% else %}
+
+{% blocktrans trimmed with book_path=book.local_path book=book|book_title %}
+wants to read <a href="{{ book_path }}">{{ book }}</a>
+{% endblocktrans %}
+
+{% endif %}
 {% endspaceless %}