From 4dd7f88e0a0501912e13303f7c49f181abe6993f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 5 Aug 2022 10:20:43 -0700 Subject: [PATCH] Updates all links that open in new tabs --- bookwyrm/templates/about/about.html | 9 +++++++-- bookwyrm/templates/author/author.html | 12 ++++++------ bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templates/book/edit/edit_book.html | 10 +++++++--- bookwyrm/templates/book/file_links/edit_links.html | 2 +- bookwyrm/templates/book/file_links/links.html | 2 +- .../book/file_links/verification_modal.html | 2 +- bookwyrm/templates/import/import.html | 6 +++++- bookwyrm/templates/import/import_status.html | 2 +- bookwyrm/templates/import/manual_review.html | 2 +- bookwyrm/templates/ostatus/remote_follow_button.html | 9 ++++++++- bookwyrm/templates/search/book.html | 8 ++++++-- .../settings/federation/instance_blocklist.html | 4 +++- .../settings/link_domains/link_domains.html | 2 +- .../templates/settings/link_domains/link_table.html | 2 +- bookwyrm/templates/setup/admin.html | 2 +- bookwyrm/templates/setup/config.html | 2 +- bookwyrm/templates/setup/layout.html | 8 ++++++-- .../templates/snippets/status/content_status.html | 1 + bookwyrm/templates/user/user.html | 2 +- 20 files changed, 61 insertions(+), 30 deletions(-) diff --git a/bookwyrm/templates/about/about.html b/bookwyrm/templates/about/about.html index b04e21b17..481ecda99 100644 --- a/bookwyrm/templates/about/about.html +++ b/bookwyrm/templates/about/about.html @@ -23,7 +23,9 @@

{% blocktrans trimmed with site_name=site.name %} {{ site_name }} is part of BookWyrm, a network of independent, self-directed communities for readers. - While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique. + While you can interact seamlessly with users anywhere in the + BookWyrm network, + this community is unique. {% endblocktrans %}

@@ -88,7 +90,10 @@

- {% trans "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." %} + {% blocktrans trimmed %} + Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. + If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard. + {% endblocktrans %}

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index afbf31784..1d87dee96 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -66,7 +66,7 @@
{% if author.wikipedia_link %}
- + {% trans "Wikipedia" %}
@@ -74,7 +74,7 @@ {% if author.isni %}
- + {% trans "View ISNI record" %}
@@ -83,7 +83,7 @@ {% trans "Load data" as button_text %} {% if author.openlibrary_key %}
- + {% trans "View on OpenLibrary" %} {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} @@ -98,7 +98,7 @@ {% if author.inventaire_id %}
- + {% trans "View on Inventaire" %} @@ -114,7 +114,7 @@ {% if author.librarything_key %}
- + {% trans "View on LibraryThing" %}
@@ -122,7 +122,7 @@ {% if author.goodreads_key %}
- + {% trans "View on Goodreads" %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index ce5e96873..95829ae9d 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -131,7 +131,7 @@ {% trans "Load data" as button_text %} {% if book.openlibrary_key %}

- + {% trans "View on OpenLibrary" %} {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} @@ -145,7 +145,7 @@ {% endif %} {% if book.inventaire_id %}

- + {% trans "View on Inventaire" %} diff --git a/bookwyrm/templates/book/edit/edit_book.html b/bookwyrm/templates/book/edit/edit_book.html index e5b865b55..ac5482a07 100644 --- a/bookwyrm/templates/book/edit/edit_book.html +++ b/bookwyrm/templates/book/edit/edit_book.html @@ -78,9 +78,13 @@

{% with book_title=match.book_set.first.title alt_title=match.bio %} {% if book_title %} - {% trans "Author of " %}{{ book_title }} - {% else %} - {% if alt_title %}{% trans "Author of " %}{{ alt_title }}{% else %} {% trans "Find more information at isni.org" %}{% endif %} + {% blocktrans trimmed %} + Author of {{ book_title }} + {% endblocktrans %} + {% else %} + {% if alt_title %}{% blocktrans trimmed %{ + Author of {{ alt_title }} + {% endblocktrans %}{% else %}{% trans "Find more information at isni.org" %}{% endif %} {% endif %} {% endwith %}

diff --git a/bookwyrm/templates/book/file_links/edit_links.html b/bookwyrm/templates/book/file_links/edit_links.html index fb722753f..77431726b 100644 --- a/bookwyrm/templates/book/file_links/edit_links.html +++ b/bookwyrm/templates/book/file_links/edit_links.html @@ -39,7 +39,7 @@ {% for link in links %} - {{ link.url }} + {{ link.url }} {% if link.added_by %} diff --git a/bookwyrm/templates/book/file_links/links.html b/bookwyrm/templates/book/file_links/links.html index 2147bf6e0..febc39e56 100644 --- a/bookwyrm/templates/book/file_links/links.html +++ b/bookwyrm/templates/book/file_links/links.html @@ -28,7 +28,7 @@ {% for link in links.all %} {% join "verify" link.id as verify_modal %}
  • - {{ link.name }} + {{ link.name }} ({{ link.filetype }}) {% if link.availability != "free" %} diff --git a/bookwyrm/templates/book/file_links/verification_modal.html b/bookwyrm/templates/book/file_links/verification_modal.html index 75678763f..7a9e41ad2 100644 --- a/bookwyrm/templates/book/file_links/verification_modal.html +++ b/bookwyrm/templates/book/file_links/verification_modal.html @@ -23,7 +23,7 @@ Is that where you'd like to go?
    • -{% trans "Continue" %} +{% trans "Continue" %} {% endif %} {% endblock %} diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html index fc00389c5..9657773d6 100644 --- a/bookwyrm/templates/import/import.html +++ b/bookwyrm/templates/import/import.html @@ -39,7 +39,11 @@

    - {% trans 'You can download your Goodreads data from the Import/Export page of your Goodreads account.' %} + {% blocktrans trimmed %} + You can download your Goodreads data from the + Import/Export page + of your Goodreads account. + {% endblocktrans %}

    diff --git a/bookwyrm/templates/import/import_status.html b/bookwyrm/templates/import/import_status.html index 3a063954a..d0ad7b7e7 100644 --- a/bookwyrm/templates/import/import_status.html +++ b/bookwyrm/templates/import/import_status.html @@ -169,7 +169,7 @@

    {{ item.review|truncatechars:100 }}

    {% endif %} {% if item.linked_review %} - {% trans "View imported review" %} + {% trans "View imported review" %} {% endif %} {% block import_cols %} diff --git a/bookwyrm/templates/import/manual_review.html b/bookwyrm/templates/import/manual_review.html index 7e429a0fa..392eae639 100644 --- a/bookwyrm/templates/import/manual_review.html +++ b/bookwyrm/templates/import/manual_review.html @@ -42,7 +42,7 @@
    {% with guess=item.book_guess %}
    - + {% include 'snippets/book_cover.html' with book=guess cover_class='is-h-s' size='small' %}
    diff --git a/bookwyrm/templates/ostatus/remote_follow_button.html b/bookwyrm/templates/ostatus/remote_follow_button.html index fc869229a..60e841c4d 100644 --- a/bookwyrm/templates/ostatus/remote_follow_button.html +++ b/bookwyrm/templates/ostatus/remote_follow_button.html @@ -4,7 +4,14 @@
    - + {% blocktrans with username=user.localname %}Follow on Fediverse{% endblocktrans %}
    diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html index e7800a780..caaa08e14 100644 --- a/bookwyrm/templates/search/book.html +++ b/bookwyrm/templates/search/book.html @@ -42,7 +42,11 @@ {% trans 'Results from' %} - {{ result_set.connector.name|default:result_set.connector.identifier }} + {{ result_set.connector.name|default:result_set.connector.identifier }} @@ -63,7 +67,7 @@ {{ result.title }} diff --git a/bookwyrm/templates/settings/federation/instance_blocklist.html b/bookwyrm/templates/settings/federation/instance_blocklist.html index 4f1fe9cb1..39af6a6dd 100644 --- a/bookwyrm/templates/settings/federation/instance_blocklist.html +++ b/bookwyrm/templates/settings/federation/instance_blocklist.html @@ -59,7 +59,9 @@