diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 5306950c..3204c603 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -96,6 +96,7 @@ class Book(BookDataModel): if self.languages and self.languages[0] != "English" else None, str(self.published_date.year) if self.published_date else None, + ", ".join(self.publishers) if hasattr(self, "publishers") else None, ] return ", ".join(i for i in items if i) diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html index a96c6096..12495061 100644 --- a/bookwyrm/templates/book.html +++ b/bookwyrm/templates/book.html @@ -91,7 +91,7 @@ {% blocktrans with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}Published {{ date }} by {{ publisher }}.{% endblocktrans %} {% elif book.published_date %} {% blocktrans with date=book.published_date|date:'M jS Y' %}Published {{ date }}{% endblocktrans %} - {% else %} + {% elif book.publishers %} {% blocktrans with publisher=book.publishers|join:', ' %}Published by {{ publisher }}.{% endblocktrans %} {% endif %}
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html index 401dc294..5c21ac95 100644 --- a/bookwyrm/templates/edit_book.html +++ b/bookwyrm/templates/edit_book.html @@ -88,31 +88,46 @@{{ form.title }}
+{{ form.title }}
{% for error in form.title.errors %}{{ error | escape }}
{% endfor %} -{{ form.subtitle }}
+ +{{ form.subtitle }}
{% for error in form.subtitle.errors %}{{ error | escape }}
{% endfor %} -{{ form.description }}
+ +{{ form.description }}
{% for error in form.description.errors %}{{ error | escape }}
{% endfor %} -{{ form.series }}
+ +{{ form.series }}
{% for error in form.series.errors %}{{ error | escape }}
{% endfor %} -{{ form.series_number }}
+ +{{ form.series_number }}
{% for error in form.series_number.errors %}{{ error | escape }}
{% endfor %} -{{ form.first_published_date }}
+ ++ + {{ form.publishers }} + {% trans "Separate multiple publishers with commas." %} +
+ {% for error in form.publishers.errors %} +{{ error | escape }}
+ {% endfor %} + +{{ form.first_published_date }}
{% for error in form.first_published_date.errors %}{{ error | escape }}
{% endfor %} -{{ form.published_date }}
+ +{{ form.published_date }}
{% for error in form.published_date.errors %}{{ error | escape }}
{% endfor %} @@ -131,8 +146,8 @@ {% endif %} -Separate multiple author names with commas.
+Separate multiple author names with commas.
{{ form.physical_format }}
+{{ form.physical_format }}
{% for error in form.physical_format.errors %}{{ error | escape }}
{% endfor %} @@ -162,7 +177,7 @@{{ error | escape }}
{% endfor %} -{{ form.pages }}
+{{ form.pages }}
{% for error in form.pages.errors %}{{ error | escape }}
{% endfor %} @@ -170,23 +185,23 @@{{ form.isbn_13 }}
+{{ form.isbn_13 }}
{% for error in form.isbn_13.errors %}{{ error | escape }}
{% endfor %} -{{ form.isbn_10 }}
+{{ form.isbn_10 }}
{% for error in form.isbn_10.errors %}{{ error | escape }}
{% endfor %} -{{ form.openlibrary_key }}
+{{ form.openlibrary_key }}
{% for error in form.openlibrary_key.errors %}{{ error | escape }}
{% endfor %} -{{ form.oclc_number }}
+{{ form.oclc_number }}
{% for error in form.oclc_number.errors %}{{ error | escape }}
{% endfor %} -{{ form.asin }}
+{{ form.asin }}
{% for error in form.ASIN.errors %}{{ error | escape }}
{% endfor %}