From e2622d05942f90f46ea33a6f1e057f64390fd4d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 14:27:49 -0800
Subject: [PATCH] Catches a couple translations, hides profile box when empty

---
 bookwyrm/templates/discover/landing_layout.html |  4 ++--
 bookwyrm/templates/discover/large-book.html     |  3 ++-
 bookwyrm/templates/discover/small-book.html     |  3 ++-
 bookwyrm/templates/layout.html                  | 10 +++++-----
 bookwyrm/templates/snippets/username.html       |  4 ++--
 bookwyrm/templates/user/user_layout.html        |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
index 3aa27e393..5cfa1fd39 100644
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -54,11 +54,11 @@
         <div class="tile is-child box has-background-white-bis">
             <h2 class="title is-4">{% trans "Your Account" %}</h2>
             {% include 'user/user_preview.html' with user=request.user %}
+            {% if request.user.summary %}
             <div class="box content">
-                {% if request.user.summary %}
                 {{ request.user.summary | to_markdown | safe }}
-                {% endif %}
             </div>
+            {% endif %}
         </div>
         {% endif %}
     </div>
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 7881a33ab..44b91b946 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% if book %}
 <div class="columns">
     <div class="column is-narrow">
@@ -8,7 +9,7 @@
     <div class="column">
         <h3 class="title is-5"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
         {% if book.authors %}
-        <p class="subtitle is-5">by {% include 'snippets/authors.html' with book=book %}</p>
+        <p class="subtitle is-5">{% trans "by" %} {% include 'snippets/authors.html' with book=book %}</p>
         {% endif %}
         {% if book|book_description %}
         <blockquote class="content">{{ book|book_description|to_markdown|safe|truncatewords_html:50 }}</blockquote>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 72108c309..6df277466 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -1,11 +1,12 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% if book %}
 <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
 <h3 class="title is-6"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
 {% if book.authors %}
-<p class="subtitle is-6">by {% include 'snippets/authors.html' with book=book %}</p>
+<p class="subtitle is-6">{% trans "by" %} {% include 'snippets/authors.html' with book=book %}</p>
 {% endif %}
 
 {% endif %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 6e4458893..ee42b4f6e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -149,12 +149,12 @@
                             <div class="columns is-variable is-1">
                                 <div class="column">
                                     <label class="is-sr-only" for="id_localname">{% trans "Username:" %}</label>
-                                    <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="username">
+                                    <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="{% trans 'username' %}">
                                 </div>
                                 <div class="column">
                                     <label class="is-sr-only" for="id_password">{% trans "Username:" %}</label>
-                                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="password">
-                                    <p class="help"><a href="/password-reset">Forgot your password?</a></p>
+                                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="{% trans 'password' %}">
+                                    <p class="help"><a href="/password-reset">{% trans "Forgot your password?" %}</a></p>
                                 </div>
                                 <div class="column is-narrow">
                                     <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
@@ -165,7 +165,7 @@
                     {% if site.allow_registration and request.path != '' and request.path != '/' %}
                     <div class="column is-narrow">
                         <a href="/" class="button is-link">
-                            Join
+                            {% trans "Join" %}
                         </a>
                     </div>
                     {% endif %}
@@ -199,7 +199,7 @@
             {% if site.support_link %}
             <div class="column">
                 <span class="icon icon-heart"></span>
-                Support {{ site.name }} on <a href="{{ site.support_link }}" target="_blank">{{ site.support_title }}</a>
+                {% blocktrans %}Support {{ site.name }} on <a href="{{ site.support_link }}" target="_blank">{{ site.support_title }}</a>{% endblocktrans %}
             </div>
             {% endif %}
             <div class="column">
diff --git a/bookwyrm/templates/snippets/username.html b/bookwyrm/templates/snippets/username.html
index e18ba1f8d..b004582d5 100644
--- a/bookwyrm/templates/snippets/username.html
+++ b/bookwyrm/templates/snippets/username.html
@@ -4,7 +4,7 @@
 <{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}
     class="user ml-1"
 >
-    {{ user.name|default:user|username }}
+    {{ user.display_name }}
 </a>
 
 {% if possessive %}'s{% endif %}
@@ -12,4 +12,4 @@
 {% if show_full and user.name or show_full and user.localname %}
  ({{ user.username }})
 {% endif %}
-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index bc7fe126e..d76291608 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -17,11 +17,11 @@
             {% include 'user/user_preview.html' with user=user %}
         </div>
 
+        {% if user.summary %}
         <div class="column box has-background-white-bis content">
-            {% if user.summary %}
             {{ user.summary | to_markdown | safe }}
-            {% endif %}
         </div>
+        {% endif %}
     </div>
     {% if not is_self and request.user.is_authenticated %}
     {% include 'snippets/follow_button.html' with user=user %}