From 145a31045afe44edb43f5da2572223a4c17f7c1b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 15 Oct 2021 13:36:48 -0700 Subject: [PATCH 1/8] Use "like" consistently (instead of mixing in "favorite") --- bookwyrm/templates/notifications/items/fav.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html index d430598e9..afc18d73e 100644 --- a/bookwyrm/templates/notifications/items/fav.html +++ b/bookwyrm/templates/notifications/items/fav.html @@ -18,25 +18,25 @@ {% if related_status.status_type == 'Review' %} {% blocktrans trimmed %} - favorited your review of {{ book_title }} + liked your review of {{ book_title }} {% endblocktrans %} {% elif related_status.status_type == 'Comment' %} {% blocktrans trimmed %} - favorited your comment on{{ book_title }} + liked your comment on{{ book_title }} {% endblocktrans %} {% elif related_status.status_type == 'Quotation' %} {% blocktrans trimmed %} - favorited your quote from {{ book_title }} + liked your quote from {{ book_title }} {% endblocktrans %} {% else %} {% blocktrans trimmed %} - favorited your status + liked your status {% endblocktrans %} {% endif %} From 7f75cd329ac86dae4dd8f4dfaa516b1a6ac7bdb4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 15 Oct 2021 13:42:32 -0700 Subject: [PATCH 2/8] Use instance name instead of the word "instance" where possible trying to use less jargon --- bookwyrm/templates/email/invite/html_content.html | 2 +- bookwyrm/templates/email/invite/text_content.html | 2 +- bookwyrm/templates/layout.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/email/invite/html_content.html b/bookwyrm/templates/email/invite/html_content.html index 358e23dc1..adc993b7b 100644 --- a/bookwyrm/templates/email/invite/html_content.html +++ b/bookwyrm/templates/email/invite/html_content.html @@ -12,6 +12,6 @@

{% url 'code-of-conduct' as coc_path %} {% url 'about' as about_path %} - {% blocktrans %}Learn more about this instance.{% endblocktrans %} + {% blocktrans %}Learn more about {{ site_name }}.{% endblocktrans %}

{% endblock %} diff --git a/bookwyrm/templates/email/invite/text_content.html b/bookwyrm/templates/email/invite/text_content.html index c3fcdc04e..26dcd1720 100644 --- a/bookwyrm/templates/email/invite/text_content.html +++ b/bookwyrm/templates/email/invite/text_content.html @@ -5,6 +5,6 @@ {{ invite_link }} -{% trans "Learn more about this instance:" %} https://{{ domain }}{% url 'about' %} +{% blocktrans %}Learn more about {{ site_name }}:{% endblocktrans %} https://{{ domain }}{% url 'about' %} {% endblock %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index ce3eee2ba..d475646e8 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -227,7 +227,7 @@

- {% trans "About this instance" %} + {% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}

{% if site.admin_email %}

From 032dedabb4f69cfe244a454840f280e627153830 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 15 Oct 2021 13:47:28 -0700 Subject: [PATCH 3/8] Goodreads capitalization standardization --- bookwyrm/importers/goodreads_import.py | 4 ++-- bookwyrm/importers/importer.py | 2 +- bookwyrm/templates/import/import.html | 4 ++-- bookwyrm/templates/import/tooltip.html | 2 +- bookwyrm/views/import_data.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bookwyrm/importers/goodreads_import.py b/bookwyrm/importers/goodreads_import.py index 7b577ea85..c62e65827 100644 --- a/bookwyrm/importers/goodreads_import.py +++ b/bookwyrm/importers/goodreads_import.py @@ -3,10 +3,10 @@ from . import Importer class GoodreadsImporter(Importer): - """GoodReads is the default importer, thus Importer follows its structure. + """Goodreads is the default importer, thus Importer follows its structure. For a more complete example of overriding see librarything_import.py""" - service = "GoodReads" + service = "Goodreads" def parse_fields(self, entry): """handle the specific fields in goodreads csvs""" diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index a10b4060c..6d898a2a3 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -1,4 +1,4 @@ -""" handle reading a csv from an external service, defaults are from GoodReads """ +""" handle reading a csv from an external service, defaults are from Goodreads """ import csv import logging diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html index cc296b75b..81f0daa54 100644 --- a/bookwyrm/templates/import/import.html +++ b/bookwyrm/templates/import/import.html @@ -22,8 +22,8 @@