Merge branch 'main' into i18n-second-pass

2021-02-28 17:22:25 -08:00
parent fc5a180f0f b2779cc6bf
commit bd44bf0980
61 changed files with 422 additions and 346 deletions
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+
+{% block title %}{{ author.name }}{% endblock %}
+
 {% block content %}
 <div class="block">
    <div class="columns is-mobile">
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@ -2,8 +2,10 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
-{% block content %}

+{% block title %}{{ book.title }}{% endblock %}
+
+{% block content %}
 <div class="block">
    <div class="columns is-mobile">
        <div class="column">
--- a/bookwyrm/templates/discover/about.html
+++ b/bookwyrm/templates/discover/about.html
@ -1,10 +1,10 @@
 {% extends 'discover/landing_layout.html' %}
 {% load i18n %}
-{% block panel %}

+{% block panel %}
 <div class="block columns mt-4">
    <nav class="menu column is-one-quarter">
-        <h2 class="menu-label">About {{ site.name }}</h2>
+        <h2 class="menu-label">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</h2>
        <ul class="menu-list">
            <li>
                <a href="#coc">{% trans "Code of Conduct" %}</a>
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}

+{% block title %}{% trans "Welcome" %}{% endblock %}
+
+{% block content %}
 <header class="block has-text-centered">
    <h1 class="title">{{ site.name }}</h1>
    <h2 class="subtitle">{{ site.instance_tagline }}</h2>
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Edit Author" %}: {{ author.name }}{% endblock %}
+
 {% block content %}
 <header class="block">
    <h1 class="title level-left">
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Edit Book" %}{% endblock %}
+
 {% block content %}
 <header class="block">
    <h1 class="title level-left">
--- a/bookwyrm/templates/editions.html
+++ b/bookwyrm/templates/editions.html
@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+
+{% block title %}{% blocktrans with book_title=work.title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
+
 {% block content %}
 <div class="block">
    <h1 class="title">{% blocktrans with path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
--- a/bookwyrm/templates/error.html
+++ b/bookwyrm/templates/error.html
@ -1,11 +1,12 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}

+{% block title %}{% trans "Oops!" %}{% endblock %}
+
+{% block content %}
 <div class="block">
    <h1 class="title">{% trans "Server Error" %}</h1>
    <p>{% trans "Something went wrong! Sorry about that." %}</p>
 </div>
-
 {% endblock %}

--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@ -3,7 +3,13 @@
 {% block panel %}

 <header class="block">
-    <h1 class="title">Direct Messages{% if partner %} with {% include 'snippets/username.html' with user=partner %}{% endif %}</h1>
+    <h1 class="title">
+        {% if partner %}
+        {% blocktrans with username=partner.display_name path=partner.local_path %}Direct Messages with <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
+        {% else %}
+        {% trans "Direct Messages" %}
+        {% endif %}
+    </h1>
    {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
 </header>

--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}

+{% block title %}{% trans "Updates" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
    {% if user.is_authenticated %}
    <div class="column is-one-third">
--- a/bookwyrm/templates/feed/status.html
+++ b/bookwyrm/templates/feed/status.html
@ -1,5 +1,6 @@
 {% extends 'feed/feed_layout.html' %}
 {% load i18n %}
+
 {% block panel %}
 <header class="block">
    <a href="/#feed" class="button" data-back>
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@ -23,7 +23,7 @@
        <section class="card {% if goal %}hidden{% endif %}" id="show-edit-goal">
            <header class="card-header">
                <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
-                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {{ year }} reading goal
+                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
                </h2>
            </header>
            <section class="card-content content">
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Import Books" %}{% endblock %}
+
 {% block content %}
 <div class="block">
    <h1 class="title">{% trans "Import Books" %}</h1>
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@ -2,6 +2,9 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
+
+{% block title %}{% trans "Import Status" %}{% endblock %}
+
 {% block content %}
 <div class="block">
    <h1 class="title">{% trans "Import Status" %}</h1>
--- a/bookwyrm/templates/invite.html
+++ b/bookwyrm/templates/invite.html
@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Create an Account" %}{% endblock %}
+
 {% block content %}

 <div class="columns">
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@ -3,7 +3,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>{% if title %}{{ title }} | {% endif %}{{ site.name }}</title>
+    <title>{% block title %}BookWyrm{% endblock %} | {{ site.name }}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <link type="text/css" rel="stylesheet" href="/static/css/bulma.min.css">
    <link type="text/css" rel="stylesheet" href="/static/css/format.css">
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@ -1,8 +1,8 @@
 {% extends 'lists/list_layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block panel %}

+{% block panel %}
 {% if request.user == list.user and pending_count %}
 <div class="block content">
    <p>
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}

+{% block title %}{{ list.name }}{% endblock %}
+
+{% block content %}
 <header class="columns content is-mobile">
    <div class="column">
        <h1 class="title">{{ list.name }} <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span></h1>
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Lists" %}{% endblock %}
+
 {% block content %}

 <header class="block">
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}

+{% block title %}{% trans "Login" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
    <div class="column">
        <div class="box">
--- a/bookwyrm/templates/notfound.html
+++ b/bookwyrm/templates/notfound.html
@ -1,10 +1,11 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}

+{% block title %}{% trans "Not Found" %}{% endblock %}
+
+{% block content %}
 <div class="block">
    <h1 class="title">{% trans "Not Found" %}</h1>
    <p>{% trans "The page your requested doesn't seem to exist!" %}</p>
 </div>
-
 {% endblock %}
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@ -2,6 +2,9 @@
 {% load i18n %}
 {% load humanize %}
 {% load bookwyrm_tags %}
+
+{% block title %}{% trans "Notifications" %}{% endblock %}
+
 {% block content %}
 <div class="block">
    <h1 class="title">{% trans "Notifications" %}</h1>
--- a/bookwyrm/templates/password_reset.html
+++ b/bookwyrm/templates/password_reset.html
@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}

+{% block title %}{% trans "Reset Password" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
    <div class="column">
        <div class="block">
--- a/bookwyrm/templates/password_reset_request.html
+++ b/bookwyrm/templates/password_reset_request.html
@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}

+{% block title %}{% trans "Reset Password" %}{% endblock %}
+
+{% block content %}
 <div class="columns is-centered">
    <div class="column is-half">
        <div class="block">
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@ -1,6 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}

+{% block title %}{% trans "Blocked Users" %}{{ author.name }}{% endblock %}
+
 {% block header %}
 {% trans "Blocked Users" %}
 {% endblock %}
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@ -1,5 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
 {% block header %}
 {% trans "Change Password" %}
 {% endblock %}
@ -15,6 +18,6 @@
        <label class="label" for="id_confirm_password">{% trans "Confirm password:" %}</label>
        <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
    </div>
-    <button class="button is-primary" type="submit">{% trans "Change password" %}</button>
+    <button class="button is-primary" type="submit">{% trans "Change Password" %}</button>
 </form>
 {% endblock %}
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@ -1,5 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Edit Profile" %}{% endblock %}
+
 {% block header %}
 {% trans "Edit Profile" %}
 {% endblock %}
--- a/bookwyrm/templates/preferences/preferences_layout.html
+++ b/bookwyrm/templates/preferences/preferences_layout.html
@ -14,13 +14,13 @@
                <a href="/preferences/profile"{% if '/preferences/profile' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Profile" %}</a>
            </li>
            <li>
-                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change password" %}</a>
+                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
            </li>
        </ul>
        <h2 class="menu-label">{% trans "Relationships" %}</h2>
        <ul class="menu-list">
            <li>
-                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked users" %}</a>
+                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked Users" %}</a>
            </li>
        </ul>
    </nav>
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Search Results" %}{% endblock %}
+
 {% block content %}
 {% with book_results|first as local_results %}
 <div class="block">
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Administration" %}{% endblock %}
+
 {% block content %}

 <header class="block column is-offset-one-quarter pl-1">
@ -26,7 +29,7 @@
        <ul class="menu-list">
            <li>
                {% url 'settings-site' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Configuration" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Settings" %}</a>
                {% if url in request.path %}
                <ul class="emnu-list">
                    <li><a href="{{ url }}#instance-info">{% trans "Instance Info" %}</a></li>
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@ -1,5 +1,6 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+
 {% block header %}{% trans "Federated Servers" %}{% endblock %}

 {% block panel %}
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@ -1,6 +1,9 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% block header %}{% trans "Site Configuration" %}{% endblock %}
+
+{% block title %}{% trans "Site Settings" %}{% endblock %}
+
+{% block header %}{% trans "Site Settings" %}{% endblock %}

 {% block panel %}

--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@ -7,7 +7,7 @@
    <input type="hidden" name="reply_parent" value="{{ reply_parent.id }}">
    {% if type == 'review' %}
    <div class="control">
-        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title:" %}</label>
+        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title" %}:</label>
        <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'">
    </div>
    {% endif %}
@ -41,7 +41,7 @@
    </div>
    {% if type == 'quotation' %}
    <div class="control">
-        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment:" %}</label>
+        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment" %}:</label>
        {% include 'snippets/content_warning_field.html' with parent_status=status %}
        <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}"></textarea>
    </div>
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@ -3,7 +3,7 @@

 {% block card-header %}
 <h3 class="card-header-title has-background-primary has-text-white">
-    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
+    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
 </h3>
 {% endblock %}

--- a/bookwyrm/templates/tag.html
+++ b/bookwyrm/templates/tag.html
@ -1,13 +1,14 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}

+{% block title %}{{ tag.name }}{% endblock %}
+
+{% block content %}
 <div class="block">
    <h1 class="title">{% blocktrans %}Books tagged "{{ tag.name }}"{% endblocktrans %}</h1>
    {% include 'snippets/book_tiles.html' with books=books.all %}
 </div>
-
 {% endblock %}


--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@ -4,11 +4,7 @@

 {% block header %}
 <h1 class="title">
-    {% if is_self %}Your
-    {% else %}
-    {% include 'snippets/username.html' with user=user possessive=True %}
-    {% endif %}
-    followers
+    {% trans "User Profile" %}
 </h1>
 {% endblock %}

--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@ -4,11 +4,7 @@

 {% block header %}
 <h1 class="title">
-    Users following
-    {% if is_self %}you
-    {% else %}
-    {% include 'snippets/username.html' with user=user %}
-    {% endif %}
+    {% trans "User Profile" %}
 </h1>
 {% endblock %}

--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@ -5,11 +5,11 @@
 <div class="columns is-mobile">
    <div class="column">
        <h1 class="title">
-            {% if is_self %}Your
+            {% if is_self %}
+            {% trans "Your Lists" %}
            {% else %}
-            {% include 'snippets/username.html' with user=user %}'s
+            {% blocktrans with username=user.display_name %}Lists: {{ username }}{% endblocktrans %}
            {% endif %}
-            Lists
        </h1>
    </div>
    {% if is_self %}
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@ -5,11 +5,11 @@
 {% block header %}
 <header class="columns">
    <h1 class="title">
-        {% if is_self %}Your
+        {% if is_self %}
+        {% trans "Your Shelves" %}
        {% else %}
-        {% include 'snippets/username.html' with user=user possessive=True %}
+        {% blocktrans with username=user.display_name %}{{ username }}: Shelves{% endblocktrans %}
        {% endif %}
-        shelves
    </h1>
 </header>
 {% endblock %}
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@ -1,10 +1,12 @@
 {% extends 'user/user_layout.html' %}
 {% load i18n %}

+{% block title %}{{ user.name }}{% endblock %}
+
 {% block header %}
 <div class="columns is-mobile">
    <div class="column">
-        <h1 class="title">{% trans "User profile" %}</h1>
+        <h1 class="title">{% trans "User Profile" %}</h1>
    </div>
    {% if is_self %}
    <div class="column is-narrow">
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@ -3,6 +3,8 @@
 {% load humanize %}
 {% load bookwyrm_tags %}

+{% block title %}{{ user.display_name }}{% endblock %}
+
 {% block content %}
 <header class="block">
    {% block header %}{% endblock %}