rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Merge pull request #1844 from bookwyrm-social/review-html

Browse source 
Fixes review markup for mastodon serialization
This commit is contained in:
Mouse Reeve 2022-01-18 13:42:02 -08:00 committed by GitHub
commit 55ae6d1f8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bookwyrm/templates/snippets/generated_status/review_pure_name.html
View file

@ -2,15 +2,15 @@
{% if rating %} {% if rating %}
{% 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 %} {% 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 }} Review of "{{ book_title }}" ({{ display_rating }} star): {{ review_title }}
{% plural %} {% plural %}
Review of "<a href='{{ book_path }}'>{{ book_title }}</a>" ({{ display_rating }} stars): {{ review_title }} Review of "{{ book_title }}" ({{ display_rating }} stars): {{ review_title }}
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
{% blocktrans trimmed with book_title=book.title|safe book_path=book.local_path review_title=name|safe %} {% 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 }} Review of "{{ book_title }}": {{ review_title }}
{% endblocktrans %} {% endblocktrans %}
{% endif %} {% endif %}

4
bookwyrm/tests/models/test_status_model.py
View file

@ -301,7 +301,7 @@ class Status(TestCase):
self.assertEqual(activity["type"], "Article") self.assertEqual(activity["type"], "Article")
self.assertEqual( self.assertEqual(
activity["name"], activity["name"],
f"Review of \"<a href='{self.book.local_path}'>{self.book.title}</a>\" (3 stars): Review's name", f'Review of "{self.book.title}" (3 stars): Review\'s name',
) )
self.assertEqual(activity["content"], "test content") self.assertEqual(activity["content"], "test content")
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")
@ -326,7 +326,7 @@ class Status(TestCase):
self.assertEqual(activity["type"], "Article") self.assertEqual(activity["type"], "Article")
self.assertEqual( self.assertEqual(
activity["name"], activity["name"],
f"Review of \"<a href='{self.book.local_path}'>{self.book.title}</a>\": Review name", f'Review of "{self.book.title}": Review name',
) )
self.assertEqual(activity["content"], "test content") self.assertEqual(activity["content"], "test content")
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")