Merge branch 'main' into production

This commit is contained in:
Mouse Reeve 2021-04-01 13:24:32 -07:00
commit 32cd7ec32d
10 changed files with 123 additions and 71 deletions

View file

@ -1,3 +1,4 @@
{% load i18n %}
<div
role="dialog"
class="modal hidden"
@ -7,12 +8,13 @@
>
{# @todo Implement focus traps to prevent tabbing out of the modal. #}
<div class="modal-background"></div>
{% trans "Close" as label %}
<div class="modal-card">
<header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
<h2 class="modal-card-title" id="modal-card-title-{{ controls_text }}-{{ controls_uid }}">
{% block modal-title %}{% endblock %}
</h2>
{% include 'snippets/toggle/toggle_button.html' with label="close" class="delete" nonbutton=True %}
{% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}
</header>
{% block modal-form-open %}{% endblock %}
{% if not no_body %}
@ -25,6 +27,6 @@
</footer>
{% block modal-form-close %}{% endblock %}
</div>
{% include 'snippets/toggle/toggle_button.html' with label="close" class="modal-close is-large" nonbutton=True %}
{% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %}
</div>

View file

@ -24,11 +24,11 @@
<form class="block" name="add-books" method="post" action="{% url 'get-started-books' %}">
{% csrf_token %}
<h3 class="title is-5">{% trans "Suggested Books" %}</h3>
<fieldset name="books" class="columns scroll-x">
<fieldset name="books" class="columns scroll-x is-mobile">
{% if book_results %}
<div class="column is-narrow content">
<p class="help mb-0">Search results</p>
<div class="columns">
<div class="columns is-mobile">
{% for book in book_results %}
{% include 'get_started/book_preview.html' %}
{% endfor %}
@ -40,7 +40,7 @@
<p class="help mb-0">
{% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
</p>
<div class="columns">
<div class="columns is-mobile">
{% for book in popular_books %}
{% include 'get_started/book_preview.html' %}
{% endfor %}

View file

@ -9,8 +9,12 @@
<div class="modal-background"></div>
<div class="modal-card is-fullwidth">
<header class="modal-card-head">
<img class="image logo mr-2" src="{% if site.logo_small %}/images/{{ site.logo_small }}{% else %}/static/images/logo-small.png{% endif %}" aria-hidden="true">
<h1 class="modal-card-title" id="get-started-header">
{% trans "Getting Started" %}
{% blocktrans %}Welcome to {{ site_name }}!{% endblocktrans %}
<span class="subtitle is-block">
{% trans "These are some first steps to get you started." %}
</span>
</h1>
<a href="/" class="delete" aria-label="{% trans 'Close' %}"></a>
</header>

View file

@ -20,7 +20,7 @@
</div>
<div class="block">
<label class="label" for="id_summary">{% trans "Summary:" %}</label>
<textarea name="summary" cols="None" rows="None" class="textarea" id="id_summary" placeholder="{% trans 'A little bit about you' %}" value="{{ request.user.summary }}"></textarea>
<textarea name="summary" cols="None" rows="None" class="textarea" id="id_summary" placeholder="{% trans 'A little bit about you' %}">{% if request.user.summary %}{{ request.user.summary }}{% endif %}</textarea>
{% for error in form.summary.errors %}
<p class="help is-danger">{{ error | escape }}</p>
{% endfor %}
@ -46,7 +46,7 @@
<div class="block">
<label class="checkbox label" for="id_discoverable">
{% trans "Show this account in suggested users:" %}
<input type="checkbox" name="discoverable" class="checkbox" id="id_discoverable" checked>
<input type="checkbox" name="discoverable" class="checkbox" id="id_discoverable" value="{{ request.user.discoverable }}">
</label>
{% url 'directory' as path %}
<p class="help">{% trans "Your account will show up in the directory, and may be recommended to other BookWyrm users." %}</p>

View file

@ -111,7 +111,7 @@ class Register(View):
invite.save()
login(request, user)
return redirect("/")
return redirect("get-started-profile")
@method_decorator(login_required, name="dispatch")

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-04-01 12:22-0700\n"
"POT-Creation-Date: 2021-04-01 13:14-0700\n"
"PO-Revision-Date: 2021-03-02 17:19-0800\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: English <LL@li.org>\n"
@ -501,9 +501,10 @@ msgid "Published by %(publisher)s."
msgstr "Veröffentlicht von %(publisher)s."
#: bookwyrm/templates/components/inline_form.html:8
#: bookwyrm/templates/components/modal.html:11
#: bookwyrm/templates/feed/feed_layout.html:57
#: bookwyrm/templates/get_started/layout.html:15
#: bookwyrm/templates/get_started/layout.html:48
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
msgid "Close"
msgstr "Schließen"
@ -946,36 +947,40 @@ msgstr "Keine Bücher gefunden"
msgid "Save &amp; continue"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:13
#, fuzzy
#| msgid "Started"
msgid "Getting Started"
msgstr "Gestartet"
#: bookwyrm/templates/get_started/layout.html:14
#, fuzzy, python-format
#| msgid "About %(site_name)s"
msgid "Welcome to %(site_name)s!"
msgstr "Über %(site_name)s"
#: bookwyrm/templates/get_started/layout.html:26
#: bookwyrm/templates/get_started/layout.html:16
msgid "These are some first steps to get you started."
msgstr ""
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/profile.html:6
#, fuzzy
#| msgid "User Profile"
msgid "Create your profile"
msgstr "Benutzerprofil"
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/layout.html:34
#, fuzzy
#| msgid "Add Books"
msgid "Add books"
msgstr "Bücher hinzufügen"
#: bookwyrm/templates/get_started/layout.html:34
#: bookwyrm/templates/get_started/layout.html:38
#, fuzzy
#| msgid "Friendly"
msgid "Find friends"
msgstr "Freundlich"
#: bookwyrm/templates/get_started/layout.html:40
#: bookwyrm/templates/get_started/layout.html:44
msgid "Skip this step"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:44
#: bookwyrm/templates/get_started/layout.html:48
#, fuzzy
#| msgid "Finished"
msgid "Finish"
@ -2741,6 +2746,11 @@ msgstr "Dieser Benutzename ist bereits vergeben."
msgid "A password reset link sent to %s"
msgstr ""
#, fuzzy
#~| msgid "Started"
#~ msgid "Getting Started"
#~ msgstr "Gestartet"
#, fuzzy, python-format
#~| msgid "No users found for \"%(query)s\""
#~ msgid "No users were found for \"%(query)s\""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-04-01 12:22-0700\n"
"POT-Creation-Date: 2021-04-01 13:14-0700\n"
"PO-Revision-Date: 2021-02-28 17:19-0800\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: English <LL@li.org>\n"
@ -475,9 +475,10 @@ msgid "Published by %(publisher)s."
msgstr ""
#: bookwyrm/templates/components/inline_form.html:8
#: bookwyrm/templates/components/modal.html:11
#: bookwyrm/templates/feed/feed_layout.html:57
#: bookwyrm/templates/get_started/layout.html:15
#: bookwyrm/templates/get_started/layout.html:48
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
msgid "Close"
msgstr ""
@ -887,28 +888,33 @@ msgstr ""
msgid "Save &amp; continue"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:13
msgid "Getting Started"
#: bookwyrm/templates/get_started/layout.html:14
#, python-format
msgid "Welcome to %(site_name)s!"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:26
#: bookwyrm/templates/get_started/layout.html:16
msgid "These are some first steps to get you started."
msgstr ""
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/profile.html:6
msgid "Create your profile"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/layout.html:34
msgid "Add books"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:34
#: bookwyrm/templates/get_started/layout.html:38
msgid "Find friends"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:40
#: bookwyrm/templates/get_started/layout.html:44
msgid "Skip this step"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:44
#: bookwyrm/templates/get_started/layout.html:48
msgid "Finish"
msgstr ""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-04-01 12:22-0700\n"
"POT-Creation-Date: 2021-04-01 13:14-0700\n"
"PO-Revision-Date: 2021-03-19 11:49+0800\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -496,9 +496,10 @@ msgid "Published by %(publisher)s."
msgstr ""
#: bookwyrm/templates/components/inline_form.html:8
#: bookwyrm/templates/components/modal.html:11
#: bookwyrm/templates/feed/feed_layout.html:57
#: bookwyrm/templates/get_started/layout.html:15
#: bookwyrm/templates/get_started/layout.html:48
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
msgid "Close"
msgstr "Cerrar"
@ -939,36 +940,40 @@ msgstr "No se encontró ningún libro"
msgid "Save &amp; continue"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:13
#, fuzzy
#| msgid "Started"
msgid "Getting Started"
msgstr "Empezado"
#: bookwyrm/templates/get_started/layout.html:14
#, fuzzy, python-format
#| msgid "About %(site_name)s"
msgid "Welcome to %(site_name)s!"
msgstr "Sobre %(site_name)s"
#: bookwyrm/templates/get_started/layout.html:26
#: bookwyrm/templates/get_started/layout.html:16
msgid "These are some first steps to get you started."
msgstr ""
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/profile.html:6
#, fuzzy
#| msgid "User Profile"
msgid "Create your profile"
msgstr "Perfil de usuario"
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/layout.html:34
#, fuzzy
#| msgid "Add Books"
msgid "Add books"
msgstr "Agregar libros"
#: bookwyrm/templates/get_started/layout.html:34
#: bookwyrm/templates/get_started/layout.html:38
#, fuzzy
#| msgid "Friendly"
msgid "Find friends"
msgstr "Amigable"
#: bookwyrm/templates/get_started/layout.html:40
#: bookwyrm/templates/get_started/layout.html:44
msgid "Skip this step"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:44
#: bookwyrm/templates/get_started/layout.html:48
#, fuzzy
#| msgid "Finished"
msgid "Finish"
@ -2733,6 +2738,11 @@ msgstr "Ya existe un usuario con ese nombre."
msgid "A password reset link sent to %s"
msgstr ""
#, fuzzy
#~| msgid "Started"
#~ msgid "Getting Started"
#~ msgstr "Empezado"
#, fuzzy, python-format
#~| msgid "No users found for \"%(query)s\""
#~ msgid "No users were found for \"%(query)s\""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-04-01 12:22-0700\n"
"POT-Creation-Date: 2021-04-01 13:14-0700\n"
"PO-Revision-Date: 2021-03-02 12:37+0100\n"
"Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n"
@ -508,9 +508,10 @@ msgid "Published by %(publisher)s."
msgstr ""
#: bookwyrm/templates/components/inline_form.html:8
#: bookwyrm/templates/components/modal.html:11
#: bookwyrm/templates/feed/feed_layout.html:57
#: bookwyrm/templates/get_started/layout.html:15
#: bookwyrm/templates/get_started/layout.html:48
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
#, fuzzy
#| msgid "Closed"
msgid "Close"
@ -962,36 +963,40 @@ msgstr "Aucun livre trouvé"
msgid "Save &amp; continue"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:13
#, fuzzy
#| msgid "Started"
msgid "Getting Started"
msgstr "Commencé"
#: bookwyrm/templates/get_started/layout.html:14
#, fuzzy, python-format
#| msgid "Join %(name)s"
msgid "Welcome to %(site_name)s!"
msgstr "À propos de %(name)s"
#: bookwyrm/templates/get_started/layout.html:26
#: bookwyrm/templates/get_started/layout.html:16
msgid "These are some first steps to get you started."
msgstr ""
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/profile.html:6
#, fuzzy
#| msgid "User Profile"
msgid "Create your profile"
msgstr "Profil"
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/layout.html:34
#, fuzzy
#| msgid "Add Books"
msgid "Add books"
msgstr "Ajouter des livres"
#: bookwyrm/templates/get_started/layout.html:34
#: bookwyrm/templates/get_started/layout.html:38
#, fuzzy
#| msgid "Friendly"
msgid "Find friends"
msgstr "Sympa"
#: bookwyrm/templates/get_started/layout.html:40
#: bookwyrm/templates/get_started/layout.html:44
msgid "Skip this step"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:44
#: bookwyrm/templates/get_started/layout.html:48
#, fuzzy
#| msgid "Finished"
msgid "Finish"
@ -2771,6 +2776,11 @@ msgstr ""
msgid "A password reset link sent to %s"
msgstr ""
#, fuzzy
#~| msgid "Started"
#~ msgid "Getting Started"
#~ msgstr "Commencé"
#, fuzzy, python-format
#~| msgid "No users found for \"%(query)s\""
#~ msgid "No users were found for \"%(query)s\""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-04-01 12:22-0700\n"
"POT-Creation-Date: 2021-04-01 13:14-0700\n"
"PO-Revision-Date: 2021-03-20 00:56+0000\n"
"Last-Translator: Kana <gudzpoz@live.com>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n"
@ -479,9 +479,10 @@ msgid "Published by %(publisher)s."
msgstr "由 %(publisher)s 出版。"
#: bookwyrm/templates/components/inline_form.html:8
#: bookwyrm/templates/components/modal.html:11
#: bookwyrm/templates/feed/feed_layout.html:57
#: bookwyrm/templates/get_started/layout.html:15
#: bookwyrm/templates/get_started/layout.html:48
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
msgid "Close"
msgstr "关闭"
@ -920,36 +921,40 @@ msgstr "没有找到书目"
msgid "Save &amp; continue"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:13
#, fuzzy
#| msgid "Started"
msgid "Getting Started"
msgstr "已开始"
#: bookwyrm/templates/get_started/layout.html:14
#, fuzzy, python-format
#| msgid "About %(site_name)s"
msgid "Welcome to %(site_name)s!"
msgstr "关于 %(site_name)s"
#: bookwyrm/templates/get_started/layout.html:26
#: bookwyrm/templates/get_started/layout.html:16
msgid "These are some first steps to get you started."
msgstr ""
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/profile.html:6
#, fuzzy
#| msgid "View user profile"
msgid "Create your profile"
msgstr "查看用户个人资料"
#: bookwyrm/templates/get_started/layout.html:30
#: bookwyrm/templates/get_started/layout.html:34
#, fuzzy
#| msgid "Add Books"
msgid "Add books"
msgstr "添加书目"
#: bookwyrm/templates/get_started/layout.html:34
#: bookwyrm/templates/get_started/layout.html:38
#, fuzzy
#| msgid "Friendly"
msgid "Find friends"
msgstr "友好"
#: bookwyrm/templates/get_started/layout.html:40
#: bookwyrm/templates/get_started/layout.html:44
msgid "Skip this step"
msgstr ""
#: bookwyrm/templates/get_started/layout.html:44
#: bookwyrm/templates/get_started/layout.html:48
#, fuzzy
#| msgid "Finished"
msgid "Finish"
@ -2689,6 +2694,11 @@ msgstr "已经存在使用该用户名的用户。"
msgid "A password reset link sent to %s"
msgstr ""
#, fuzzy
#~| msgid "Started"
#~ msgid "Getting Started"
#~ msgstr "已开始"
#, fuzzy, python-format
#~| msgid "No users found for \"%(query)s\""
#~ msgid "No users were found for \"%(query)s\""