Skip to content

Commit

Permalink
Merge pull request #3003 from dato/book_info_first_pub_date
Browse files Browse the repository at this point in the history
Fallback to showing first published date
  • Loading branch information
jaschaurbach authored Oct 17, 2023
2 parents 3ade72b + ec2c5cb commit 06923c6
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions bookwyrm/templates/book/publisher_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,13 @@
</p>
{% endif %}

{% with date=book.published_date|naturalday publisher=book.publishers|join:', ' %}
{% if date or book.first_published_date or book.publishers %}
{% if date or book.first_published_date %}
{% if book.published_date or book.first_published_date %}
<meta
itemprop="datePublished"
content="{{ book.first_published_date|default:book.published_date|date:'Y-m-d' }}"
>
{% endif %}
<p>

{% comment %}
@todo The publisher property needs to be an Organization or a Person. We’ll be using Thing which is the more generic ancestor.
@see https://schema.org/Publisher
Expand All @@ -60,14 +57,14 @@
{% endfor %}
{% endif %}

{% if date and publisher %}
{% with date=book.published_date|default:book.first_published_date|naturalday publisher=book.publishers|join:', ' %}
{% if book.published_date and publisher %}
{% blocktrans %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
{% elif date %}
{% blocktrans %}Published {{ date }}{% endblocktrans %}
{% elif publisher %}
{% blocktrans %}Published by {{ publisher }}.{% endblocktrans %}
{% elif date %}
{% blocktrans %}Published {{ date }}{% endblocktrans %}
{% endif %}
{% endwith %}
</p>
{% endif %}
{% endwith %}
{% endspaceless %}

0 comments on commit 06923c6

Please sign in to comment.