diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html index 9dd831894..bc1034a8d 100644 --- 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 %}
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html index 92d758a64..10682347a 100644 --- 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 %}
diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html index dd0a8129b..a6f3a026a 100644 --- 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 %}
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html index 7223b17bf..8bbb7af26 100644 --- 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 %}
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html index 73178ac88..16741436c 100644 --- 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 %}
@@ -26,7 +29,7 @@
  • {% url 'settings-site' as url %} - {% trans "Site Configuration" %} + {% trans "Site Settings" %} {% if url in request.path %}
    • {% trans "Instance Info" %}
      • diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html index 174b8c149..c08ba66cd 100644 --- 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 %} diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html index 2716ea3d3..2e43bb74d 100644 --- 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 %} diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html index 11bdcd359..187eae605 100644 --- a/bookwyrm/templates/snippets/create_status_form.html +++ b/bookwyrm/templates/snippets/create_status_form.html @@ -7,7 +7,7 @@ {% if type == 'review' %}
      - +
      {% endif %} @@ -41,7 +41,7 @@
{% if type == 'quotation' %}
- + {% include 'snippets/content_warning_field.html' with parent_status=status %}
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html index 386c030c8..084a5ad0b 100644 --- a/bookwyrm/templates/snippets/goal_card.html +++ b/bookwyrm/templates/snippets/goal_card.html @@ -3,7 +3,7 @@ {% block card-header %}

- {% blocktrans %}{{ year }} reading goal{% endblocktrans %} + {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}

{% endblock %} diff --git a/bookwyrm/templates/tag.html b/bookwyrm/templates/tag.html index f30b73955..b6fa67783 100644 --- 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 %}

{% blocktrans %}Books tagged "{{ tag.name }}"{% endblocktrans %}

{% include 'snippets/book_tiles.html' with books=books.all %}
- {% endblock %} diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html index 16ec7d4f0..302bb8a3d 100644 --- a/bookwyrm/templates/user/followers.html +++ b/bookwyrm/templates/user/followers.html @@ -4,11 +4,7 @@ {% block header %}

- {% if is_self %}Your - {% else %} - {% include 'snippets/username.html' with user=user possessive=True %} - {% endif %} - followers + {% trans "User Profile" %}

{% endblock %} diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html index 13af44173..c565cd16b 100644 --- a/bookwyrm/templates/user/following.html +++ b/bookwyrm/templates/user/following.html @@ -4,11 +4,7 @@ {% block header %}

- Users following - {% if is_self %}you - {% else %} - {% include 'snippets/username.html' with user=user %} - {% endif %} + {% trans "User Profile" %}

{% endblock %} diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html index a3f5b961e..8e47041f4 100644 --- a/bookwyrm/templates/user/lists.html +++ b/bookwyrm/templates/user/lists.html @@ -5,11 +5,11 @@

- {% 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

{% if is_self %} diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html index b32d7a7c3..c7c833886 100644 --- a/bookwyrm/templates/user/shelf.html +++ b/bookwyrm/templates/user/shelf.html @@ -5,11 +5,11 @@ {% block header %}

- {% 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

{% endblock %} diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html index bcab8d84f..5dd24caee 100644 --- 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 %}
-

{% trans "User profile" %}

+

{% trans "User Profile" %}

{% if is_self %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html index c8eea4128..bc7fe126e 100644 --- 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 %}
{% block header %}{% endblock %} diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py index a74febca5..13c9ce49e 100644 --- a/bookwyrm/views/authentication.py +++ b/bookwyrm/views/authentication.py @@ -6,6 +6,7 @@ from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.utils import timezone from django.utils.decorators import method_decorator +from django.views.decorators.csrf import csrf_exempt from django.views import View from bookwyrm import forms, models @@ -13,6 +14,7 @@ from bookwyrm.settings import DOMAIN # pylint: disable= no-self-use +@method_decorator(csrf_exempt, name='dispatch') class Login(View): ''' authenticate an existing user ''' def get(self, request): @@ -21,7 +23,6 @@ class Login(View): return redirect('/') # sene user to the login page data = { - 'title': 'Login', 'login_form': forms.LoginForm(), 'register_form': forms.RegisterForm(), } @@ -29,6 +30,8 @@ class Login(View): def post(self, request): ''' authentication action ''' + if request.user.is_authenticated: + return redirect('/') login_form = forms.LoginForm(request.POST) localname = login_form.data['localname'] diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index a1a37cc53..356c95ffd 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -24,7 +24,6 @@ class Author(View): books = models.Work.objects.filter( Q(authors=author) | Q(editions__authors=author)).distinct() data = { - 'title': author.name, 'author': author, 'books': [b.get_default_edition() for b in books], } @@ -41,7 +40,6 @@ class EditAuthor(View): ''' info about a book ''' author = get_object_or_404(models.Author, id=author_id) data = { - 'title': 'Edit Author', 'author': author, 'form': forms.AuthorForm(instance=author) } @@ -54,7 +52,6 @@ class EditAuthor(View): form = forms.AuthorForm(request.POST, request.FILES, instance=author) if not form.is_valid(): data = { - 'title': 'Edit Author', 'author': author, 'form': form } diff --git a/bookwyrm/views/block.py b/bookwyrm/views/block.py index cb14aae38..90e5033b5 100644 --- a/bookwyrm/views/block.py +++ b/bookwyrm/views/block.py @@ -15,8 +15,7 @@ class Block(View): ''' blocking users ''' def get(self, request): ''' list of blocked users? ''' - return TemplateResponse( - request, 'preferences/blocks.html', {'title': 'Blocked Users'}) + return TemplateResponse(request, 'preferences/blocks.html') def post(self, request, user_id): ''' block a user ''' diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py index e05c47264..1eb62d6d7 100644 --- a/bookwyrm/views/books.py +++ b/bookwyrm/views/books.py @@ -82,7 +82,6 @@ class Book(View): ) data = { - 'title': book.title, 'book': book, 'reviews': reviews_page, 'review_count': reviews.count(), @@ -113,7 +112,6 @@ class EditBook(View): if not book.description: book.description = book.parent_work.description data = { - 'title': 'Edit Book', 'book': book, 'form': forms.EditionForm(instance=book) } @@ -126,7 +124,6 @@ class EditBook(View): form = forms.EditionForm(request.POST, request.FILES, instance=book) if not form.is_valid(): data = { - 'title': 'Edit Book', 'book': book, 'form': form } @@ -146,7 +143,6 @@ class Editions(View): return ActivitypubResponse(work.to_edition_list(**request.GET)) data = { - 'title': 'Editions of %s' % work.title, 'editions': work.editions.order_by('-edition_rank').all(), 'work': work, } diff --git a/bookwyrm/views/error.py b/bookwyrm/views/error.py index 9eabe29fa..82999d6ed 100644 --- a/bookwyrm/views/error.py +++ b/bookwyrm/views/error.py @@ -3,11 +3,9 @@ from django.template.response import TemplateResponse def server_error_page(request): ''' 500 errors ''' - return TemplateResponse( - request, 'error.html', {'title': 'Oops!'}, status=500) + return TemplateResponse(request, 'error.html', status=500) def not_found_page(request, _): ''' 404s ''' - return TemplateResponse( - request, 'notfound.html', {'title': 'Not found'}, status=404) + return TemplateResponse(request, 'notfound.html', status=404) diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py index 0bd14dab3..62ae076cd 100644 --- a/bookwyrm/views/federation.py +++ b/bookwyrm/views/federation.py @@ -17,8 +17,5 @@ class Federation(View): def get(self, request): ''' edit form ''' servers = models.FederatedServer.objects.all() - data = { - 'title': 'Federated Servers', - 'servers': servers - } + data = {'servers': servers} return TemplateResponse(request, 'settings/federation.html', data) diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 3a2805b4f..5300c762a 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -38,7 +38,6 @@ class Feed(View): paginated = Paginator(activities, PAGE_LENGTH) data = {**feed_page_data(request.user), **{ - 'title': 'Updates Feed', 'user': request.user, 'activities': paginated.page(page), 'tab': tab, @@ -75,7 +74,6 @@ class DirectMessage(View): paginated = Paginator(activities, PAGE_LENGTH) activity_page = paginated.page(page) data = {**feed_page_data(request.user), **{ - 'title': 'Direct Messages', 'user': request.user, 'partner': user, 'activities': activity_page, @@ -108,7 +106,6 @@ class Status(View): status.to_activity(pure=not is_bookwyrm_request(request))) data = {**feed_page_data(request.user), **{ - 'title': 'Status by %s' % user.username, 'status': status, }} return TemplateResponse(request, 'feed/status.html', data) diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py index 97f139136..7da9e4343 100644 --- a/bookwyrm/views/goal.py +++ b/bookwyrm/views/goal.py @@ -30,7 +30,6 @@ class Goal(View): return HttpResponseNotFound() data = { - 'title': '%s\'s %d Reading' % (user.display_name, year), 'goal_form': forms.GoalForm(instance=goal), 'goal': goal, 'user': user, @@ -53,7 +52,6 @@ class Goal(View): form = forms.GoalForm(request.POST, instance=goal) if not form.is_valid(): data = { - 'title': '%s\'s %d Reading' % (request.user.display_name, year), 'goal_form': form, 'goal': goal, 'year': year, diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py index 675cae3d1..cf33163ab 100644 --- a/bookwyrm/views/import_data.py +++ b/bookwyrm/views/import_data.py @@ -19,7 +19,6 @@ class Import(View): def get(self, request): ''' load import page ''' return TemplateResponse(request, 'import.html', { - 'title': 'Import Books', 'import_form': forms.ImportForm(), 'jobs': models.ImportJob. objects.filter(user=request.user).order_by('-created_date'), @@ -71,7 +70,6 @@ class ImportStatus(View): failed_items = [i for i in items if i.fail_reason] items = [i for i in items if not i.fail_reason] return TemplateResponse(request, 'import_status.html', { - 'title': 'Import Status', 'job': job, 'items': items, 'failed_items': failed_items, diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py index 6b3611fc1..750a5c2b9 100644 --- a/bookwyrm/views/invite.py +++ b/bookwyrm/views/invite.py @@ -30,7 +30,6 @@ class ManageInvites(View): ).order_by('-created_date'), PAGE_LENGTH) data = { - 'title': 'Invitations', 'invites': paginated.page(page), 'form': forms.CreateInviteForm(), } @@ -50,7 +49,6 @@ class ManageInvites(View): user=request.user ).order_by('-created_date'), PAGE_LENGTH) data = { - 'title': 'Invitations', 'invites': paginated.page(1), 'form': form } @@ -66,7 +64,6 @@ class Invite(View): invite = get_object_or_404(models.SiteInvite, code=code) data = { - 'title': 'Join', 'register_form': forms.RegisterForm(), 'invite': invite, 'valid': invite.valid() if invite else True, diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py index 2774e7428..94b27b8fc 100644 --- a/bookwyrm/views/landing.py +++ b/bookwyrm/views/landing.py @@ -12,10 +12,7 @@ class About(View): ''' create invites ''' def get(self, request): ''' more information about the instance ''' - data = { - 'title': 'About', - } - return TemplateResponse(request, 'discover/about.html', data) + return TemplateResponse(request, 'discover/about.html') class Home(View): ''' discover page or home feed depending on auth ''' @@ -43,7 +40,6 @@ class Discover(View): ).order_by('-review__published_date__max')[:6] data = { - 'title': 'Discover', 'register_form': forms.RegisterForm(), 'books': list(set(books)), } diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index e7b70a286..b1741b117 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -40,7 +40,6 @@ class Lists(View): paginated = Paginator(lists, 12) data = { - 'title': 'Lists', 'lists': paginated.page(page), 'list_form': forms.ListForm(), 'path': '/list', @@ -72,7 +71,6 @@ class UserLists(View): paginated = Paginator(lists, 12) data = { - 'title': '%s: Lists' % user.name, 'user': user, 'is_self': request.user.id == user.id, 'lists': paginated.page(page), @@ -114,7 +112,6 @@ class List(View): data = { - 'title': '%s | Lists' % book_list.name, 'list': book_list, 'items': book_list.listitem_set.filter(approved=True), 'pending_count': book_list.listitem_set.filter( @@ -149,7 +146,6 @@ class Curate(View): return HttpResponseNotFound() data = { - 'title': 'Curate "%s" | Lists' % book_list.name, 'list': book_list, 'pending': book_list.listitem_set.filter(approved=False), 'list_form': forms.ListForm(instance=book_list), diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py index 7d6a31495..684154e4c 100644 --- a/bookwyrm/views/notifications.py +++ b/bookwyrm/views/notifications.py @@ -16,7 +16,6 @@ class Notifications(View): .order_by('-created_date') unread = [n.id for n in notifications.filter(read=False)] data = { - 'title': 'Notifications', 'notifications': notifications, 'unread': unread, } diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py index 6602a2701..792da2d78 100644 --- a/bookwyrm/views/password.py +++ b/bookwyrm/views/password.py @@ -19,7 +19,6 @@ class PasswordResetRequest(View): return TemplateResponse( request, 'password_reset_request.html', - {'title': 'Reset Password'} ) def post(self, request): @@ -53,11 +52,7 @@ class PasswordReset(View): except models.PasswordReset.DoesNotExist: raise PermissionDenied - return TemplateResponse( - request, - 'password_reset.html', - {'title': 'Reset Password', 'code': reset_code.code} - ) + return TemplateResponse(request, 'password_reset.html') def post(self, request, code): ''' allow a user to change their password through an emailed token ''' @@ -90,10 +85,7 @@ class ChangePassword(View): ''' change password as logged in user ''' def get(self, request): ''' change password page ''' - data = { - 'title': 'Change Password', - 'user': request.user, - } + data = {'user': request.user} return TemplateResponse( request, 'preferences/change_password.html', data) diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index 8acb28363..b44c49f81 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -58,7 +58,6 @@ class Search(View): book_results = connector_manager.search( query, min_confidence=min_confidence) data = { - 'title': 'Search Results', 'book_results': book_results, 'user_results': user_results, 'list_results': list_results, diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 70d3d1dea..867c7d91c 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -53,7 +53,6 @@ class Shelf(View): ).order_by('-updated_date').all() data = { - 'title': '%s\'s %s shelf' % (user.display_name, shelf.name), 'user': user, 'is_self': is_self, 'shelves': shelves.all(), diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py index 0a5e270b9..e60354a32 100644 --- a/bookwyrm/views/site.py +++ b/bookwyrm/views/site.py @@ -19,10 +19,7 @@ class Site(View): def get(self, request): ''' edit form ''' site = models.SiteSettings.objects.get() - data = { - 'title': 'Site Settings', - 'site_form': forms.SiteForm(instance=site) - } + data = {'site_form': forms.SiteForm(instance=site)} return TemplateResponse(request, 'settings/site.html', data) def post(self, request): @@ -30,10 +27,7 @@ class Site(View): site = models.SiteSettings.objects.get() form = forms.SiteForm(request.POST, instance=site) if not form.is_valid(): - data = { - 'title': 'Site Settings', - 'site_form': form - } + data = {'site_form': form} return TemplateResponse(request, 'settings/site.html', data) form.save() diff --git a/bookwyrm/views/tag.py b/bookwyrm/views/tag.py index 502f5ea53..e106e8dce 100644 --- a/bookwyrm/views/tag.py +++ b/bookwyrm/views/tag.py @@ -25,7 +25,6 @@ class Tag(View): usertag__tag__identifier=tag_id ).distinct() data = { - 'title': tag_obj.name, 'books': books, 'tag': tag_obj, } diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index a218375fd..f3a088c13 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -79,7 +79,6 @@ class User(View): if not object_visible_to_user(request.user, goal): goal = None data = { - 'title': user.name, 'user': user, 'is_self': is_self, 'shelves': shelf_preview, @@ -108,7 +107,6 @@ class Followers(View): user.to_followers_activity(**request.GET)) data = { - 'title': '%s: followers' % user.name, 'user': user, 'is_self': request.user.id == user.id, 'followers': user.followers.all(), @@ -133,7 +131,6 @@ class Following(View): user.to_following_activity(**request.GET)) data = { - 'title': '%s: following' % user.name, 'user': user, 'is_self': request.user.id == user.id, 'following': user.following.all(), @@ -147,7 +144,6 @@ class EditUser(View): def get(self, request): ''' edit profile page for a user ''' data = { - 'title': 'Edit profile', 'form': forms.EditUserForm(instance=request.user), 'user': request.user, } diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index df03d37a7..f33b27d02 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -1,77 +1,79 @@ -# English language text for the bookwyrm UI +# Stub English-language trnaslation file # Copyright (C) 2021 Mouse Reeve -# This file is distributed under the same license as the bookwyrm package. +# This file is distributed under the same license as the BookWyrm package. # Mouse Reeve , 2021 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 0.1.1\n" +"Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-28 17:11-0800\n" -"PO-Revision-Date: 2021-02-27 13:50+PST\n" +"POT-Creation-Date: 2021-02-28 17:19-0800\n" +"PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" -"Language-Team: Mouse Reeve \n" -"Language: English \n" +"Language-Team: English \n" +"Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14 +#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17 +#: bookwyrm/templates/edit_author.html:5 msgid "Edit Author" msgstr "" -#: bookwyrm/templates/author.html:29 +#: bookwyrm/templates/author.html:32 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author.html:34 +#: bookwyrm/templates/author.html:37 #, python-format msgid "Books by %(name)s" msgstr "" -#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28 +#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30 +#: bookwyrm/templates/edit_book.html:5 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book.html:43 +#: bookwyrm/templates/book.html:45 msgid "Add cover" msgstr "" -#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89 +#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89 msgid "Add" msgstr "" -#: bookwyrm/templates/book.html:58 +#: bookwyrm/templates/book.html:60 msgid "ISBN:" msgstr "" -#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104 +#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107 msgid "OCLC Number:" msgstr "" -#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108 +#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111 msgid "ASIN:" msgstr "" -#: bookwyrm/templates/book.html:84 +#: bookwyrm/templates/book.html:86 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/book.html:96 +#: bookwyrm/templates/book.html:98 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book.html:103 bookwyrm/templates/edit_book.html:36 +#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "" -#: bookwyrm/templates/book.html:107 bookwyrm/templates/edit_author.html:75 -#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42 -#: bookwyrm/templates/preferences/edit_user.html:47 -#: bookwyrm/templates/settings/site.html:86 +#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78 +#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/preferences/edit_user.html:50 +#: bookwyrm/templates/settings/site.html:89 #: bookwyrm/templates/snippets/progress_update.html:21 #: bookwyrm/templates/snippets/readthrough.html:64 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 @@ -79,8 +81,8 @@ msgstr "" msgid "Save" msgstr "" -#: bookwyrm/templates/book.html:108 bookwyrm/templates/book.html:157 -#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118 +#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159 +#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 #: bookwyrm/templates/snippets/readthrough.html:65 @@ -90,54 +92,59 @@ msgstr "" msgid "Cancel" msgstr "" -#: bookwyrm/templates/book.html:140 +#: bookwyrm/templates/book.html:142 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book.html:142 +#: bookwyrm/templates/book.html:144 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book.html:147 +#: bookwyrm/templates/book.html:149 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book.html:154 +#: bookwyrm/templates/book.html:156 msgid "Create" msgstr "" -#: bookwyrm/templates/book.html:176 +#: bookwyrm/templates/book.html:178 msgid "Tags" msgstr "" -#: bookwyrm/templates/book.html:180 bookwyrm/templates/snippets/tag.html:18 +#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18 msgid "Add tag" msgstr "" -#: bookwyrm/templates/book.html:197 +#: bookwyrm/templates/book.html:199 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book.html:208 +#: bookwyrm/templates/book.html:210 msgid "Places" msgstr "" -#: bookwyrm/templates/book.html:219 bookwyrm/templates/layout.html:64 -#: bookwyrm/templates/lists/lists.html:6 -#: bookwyrm/templates/search_results.html:87 -#: bookwyrm/templates/user/user_layout.html:60 +#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9 +#: bookwyrm/templates/search_results.html:90 +#: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "" -#: bookwyrm/templates/book.html:248 +#: bookwyrm/templates/book.html:250 msgid "rated it" msgstr "" #: bookwyrm/templates/components/inline_form.html:7 -#: bookwyrm/templates/feed/feed_layout.html:49 +#: bookwyrm/templates/feed/feed_layout.html:51 msgid "Close" msgstr "" +#: bookwyrm/templates/discover/about.html:7 +#, python-format +msgid "About %(site_name)s" +msgstr "" + #: bookwyrm/templates/discover/about.html:10 #: bookwyrm/templates/discover/about.html:20 msgid "Code of Conduct" @@ -152,158 +159,180 @@ msgstr "" msgid "Recent Books" msgstr "" -#: bookwyrm/templates/discover/landing_layout.html:15 +#: bookwyrm/templates/discover/landing_layout.html:5 +msgid "Welcome" +msgstr "" + +#: bookwyrm/templates/discover/landing_layout.html:17 msgid "Decentralized" msgstr "" -#: bookwyrm/templates/discover/landing_layout.html:21 +#: bookwyrm/templates/discover/landing_layout.html:23 msgid "Friendly" msgstr "" -#: bookwyrm/templates/discover/landing_layout.html:27 +#: bookwyrm/templates/discover/landing_layout.html:29 msgid "Anti-Corporate" msgstr "" -#: bookwyrm/templates/discover/landing_layout.html:42 +#: bookwyrm/templates/discover/landing_layout.html:44 #, python-format msgid "Join %(name)s" msgstr "" -#: bookwyrm/templates/discover/landing_layout.html:47 -#: bookwyrm/templates/login.html:46 +#: bookwyrm/templates/discover/landing_layout.html:49 +#: bookwyrm/templates/login.html:48 msgid "This instance is closed" msgstr "" -#: bookwyrm/templates/discover/landing_layout.html:53 +#: bookwyrm/templates/discover/landing_layout.html:55 msgid "Your Account" msgstr "" -#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10 +#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13 msgid "Added:" msgstr "" -#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11 +#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14 msgid "Updated:" msgstr "" -#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12 +#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15 msgid "Last edited by:" msgstr "" -#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27 +#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30 msgid "Metadata" msgstr "" -#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8 +#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8 #: bookwyrm/templates/user/create_shelf_form.html:13 #: bookwyrm/templates/user/edit_shelf_form.html:14 msgid "Name:" msgstr "" -#: bookwyrm/templates/edit_author.html:34 +#: bookwyrm/templates/edit_author.html:37 msgid "Bio:" msgstr "" -#: bookwyrm/templates/edit_author.html:39 +#: bookwyrm/templates/edit_author.html:42 msgid "Wikipedia link:" msgstr "" -#: bookwyrm/templates/edit_author.html:44 +#: bookwyrm/templates/edit_author.html:47 msgid "Birth date:" msgstr "" -#: bookwyrm/templates/edit_author.html:49 +#: bookwyrm/templates/edit_author.html:52 msgid "Death date:" msgstr "" -#: bookwyrm/templates/edit_author.html:55 +#: bookwyrm/templates/edit_author.html:58 msgid "Author Identifiers" msgstr "" -#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100 +#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103 msgid "Openlibrary key:" msgstr "" -#: bookwyrm/templates/edit_author.html:61 +#: bookwyrm/templates/edit_author.html:64 msgid "Librarything key:" msgstr "" -#: bookwyrm/templates/edit_author.html:66 +#: bookwyrm/templates/edit_author.html:69 msgid "Goodreads key:" msgstr "" -#: bookwyrm/templates/edit_book.html:28 -#: bookwyrm/templates/snippets/create_status_form.html:10 +#: bookwyrm/templates/edit_book.html:31 msgid "Title:" msgstr "" -#: bookwyrm/templates/edit_book.html:32 +#: bookwyrm/templates/edit_book.html:35 msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/edit_book.html:40 +#: bookwyrm/templates/edit_book.html:43 msgid "Series:" msgstr "" -#: bookwyrm/templates/edit_book.html:44 +#: bookwyrm/templates/edit_book.html:47 msgid "Series number:" msgstr "" -#: bookwyrm/templates/edit_book.html:48 +#: bookwyrm/templates/edit_book.html:51 msgid "First published date:" msgstr "" -#: bookwyrm/templates/edit_book.html:52 +#: bookwyrm/templates/edit_book.html:55 msgid "Published date:" msgstr "" -#: bookwyrm/templates/edit_book.html:65 +#: bookwyrm/templates/edit_book.html:68 #: bookwyrm/templates/snippets/shelf.html:9 msgid "Cover" msgstr "" -#: bookwyrm/templates/edit_book.html:75 +#: bookwyrm/templates/edit_book.html:78 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/edit_book.html:76 +#: bookwyrm/templates/edit_book.html:79 msgid "Format:" msgstr "" -#: bookwyrm/templates/edit_book.html:84 +#: bookwyrm/templates/edit_book.html:87 msgid "Pages:" msgstr "" -#: bookwyrm/templates/edit_book.html:91 +#: bookwyrm/templates/edit_book.html:94 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/edit_book.html:92 +#: bookwyrm/templates/edit_book.html:95 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/edit_book.html:96 +#: bookwyrm/templates/edit_book.html:99 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/editions.html:6 +#: bookwyrm/templates/editions.html:5 +#, python-format +msgid "Editions of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/editions.html:9 #, python-format msgid "Editions of \"%(work_title)s\"" msgstr "" -#: bookwyrm/templates/error.html:6 +#: bookwyrm/templates/error.html:4 +msgid "Oops!" +msgstr "" + +#: bookwyrm/templates/error.html:8 msgid "Server Error" msgstr "" -#: bookwyrm/templates/error.html:7 +#: bookwyrm/templates/error.html:9 msgid "Something went wrong! Sorry about that." msgstr "" -#: bookwyrm/templates/feed/direct_messages.html:7 +#: bookwyrm/templates/feed/direct_messages.html:8 +#, python-format +msgid "Direct Messages with %(username)s" +msgstr "" + +#: bookwyrm/templates/feed/direct_messages.html:10 +#: bookwyrm/templates/layout.html:79 +msgid "Direct Messages" +msgstr "" + +#: bookwyrm/templates/feed/direct_messages.html:13 msgid "All messages" msgstr "" -#: bookwyrm/templates/feed/direct_messages.html:16 +#: bookwyrm/templates/feed/direct_messages.html:22 msgid "You have no messages right now." msgstr "" @@ -333,21 +362,26 @@ msgid "" "There aren't any activities right now! Try following a user to get started" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:9 -msgid "Your books" +#: bookwyrm/templates/feed/feed_layout.html:5 +msgid "Updates" msgstr "" #: bookwyrm/templates/feed/feed_layout.html:11 +msgid "Your books" +msgstr "" + +#: bookwyrm/templates/feed/feed_layout.html:13 msgid "" "There are no books here right now! Try searching for a book to get started" msgstr "" -#: bookwyrm/templates/feed/feed_layout.html:71 +#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26 +#: bookwyrm/templates/snippets/goal_card.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/status.html:7 +#: bookwyrm/templates/feed/status.html:8 msgid "Back" msgstr "" @@ -383,102 +417,106 @@ msgstr "" msgid "%(username)s's %(year)s Books" msgstr "" -#: bookwyrm/templates/import.html:6 bookwyrm/templates/layout.html:94 +#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 +#: bookwyrm/templates/layout.html:94 msgid "Import Books" msgstr "" -#: bookwyrm/templates/import.html:11 +#: bookwyrm/templates/import.html:14 msgid "Data source" msgstr "" -#: bookwyrm/templates/import.html:29 +#: bookwyrm/templates/import.html:32 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import.html:34 +#: bookwyrm/templates/import.html:37 msgid "Privacy setting for imported reviews:" msgstr "" -#: bookwyrm/templates/import.html:38 +#: bookwyrm/templates/import.html:41 msgid "Import" msgstr "" -#: bookwyrm/templates/import.html:43 +#: bookwyrm/templates/import.html:46 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import.html:45 +#: bookwyrm/templates/import.html:48 msgid "No recent imports" msgstr "" -#: bookwyrm/templates/import_status.html:7 +#: bookwyrm/templates/import_status.html:6 +#: bookwyrm/templates/import_status.html:10 msgid "Import Status" msgstr "" -#: bookwyrm/templates/import_status.html:10 +#: bookwyrm/templates/import_status.html:13 msgid "Import started:" msgstr "" -#: bookwyrm/templates/import_status.html:14 +#: bookwyrm/templates/import_status.html:17 msgid "Import completed:" msgstr "" -#: bookwyrm/templates/import_status.html:17 +#: bookwyrm/templates/import_status.html:20 msgid "TASK FAILED" msgstr "" -#: bookwyrm/templates/import_status.html:23 +#: bookwyrm/templates/import_status.html:26 msgid "Import still in progress." msgstr "" -#: bookwyrm/templates/import_status.html:25 +#: bookwyrm/templates/import_status.html:28 msgid "(Hit reload to update!)" msgstr "" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import_status.html:35 msgid "Failed to load" msgstr "" -#: bookwyrm/templates/import_status.html:56 +#: bookwyrm/templates/import_status.html:59 msgid "Select all" msgstr "" -#: bookwyrm/templates/import_status.html:59 +#: bookwyrm/templates/import_status.html:62 msgid "Retry items" msgstr "" -#: bookwyrm/templates/import_status.html:81 +#: bookwyrm/templates/import_status.html:84 msgid "Successfully imported" msgstr "" -#: bookwyrm/templates/import_status.html:85 +#: bookwyrm/templates/import_status.html:88 #: bookwyrm/templates/lists/curate.html:14 msgid "Book" msgstr "" -#: bookwyrm/templates/import_status.html:88 +#: bookwyrm/templates/import_status.html:91 +#: bookwyrm/templates/snippets/create_status_form.html:10 #: bookwyrm/templates/snippets/shelf.html:10 msgid "Title" msgstr "" -#: bookwyrm/templates/import_status.html:91 +#: bookwyrm/templates/import_status.html:94 #: bookwyrm/templates/snippets/shelf.html:11 msgid "Author" msgstr "" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import_status.html:117 msgid "Imported" msgstr "" -#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41 +#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 +#: bookwyrm/templates/login.html:43 msgid "Create an Account" msgstr "" -#: bookwyrm/templates/invite.html:18 +#: bookwyrm/templates/invite.html:21 msgid "Permission Denied" msgstr "" -#: bookwyrm/templates/invite.html:19 +#: bookwyrm/templates/invite.html:22 msgid "Sorry! This invite code is no longer valid." msgstr "" @@ -503,10 +541,6 @@ msgstr "" msgid "Feed" msgstr "" -#: bookwyrm/templates/layout.html:79 -msgid "Direct Messages" -msgstr "" - #: bookwyrm/templates/layout.html:84 #: bookwyrm/templates/preferences/preferences_layout.html:14 msgid "Profile" @@ -517,14 +551,12 @@ msgid "Settings" msgstr "" #: bookwyrm/templates/layout.html:103 -#: bookwyrm/templates/settings/admin_layout.html:16 +#: bookwyrm/templates/settings/admin_layout.html:19 #: bookwyrm/templates/settings/manage_invites.html:3 msgid "Invites" msgstr "" #: bookwyrm/templates/layout.html:110 -#: bookwyrm/templates/settings/admin_layout.html:29 -#: bookwyrm/templates/settings/site.html:3 msgid "Site Configuration" msgstr "" @@ -533,18 +565,19 @@ msgid "Log out" msgstr "" #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126 -#: bookwyrm/templates/notifications.html:7 +#: bookwyrm/templates/notifications.html:6 +#: bookwyrm/templates/notifications.html:10 msgid "Notifications" msgstr "" #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147 -#: bookwyrm/templates/login.html:15 +#: bookwyrm/templates/login.html:17 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "" -#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8 -#: bookwyrm/templates/login.html:31 +#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/login.html:33 msgid "Log in" msgstr "" @@ -563,7 +596,7 @@ msgid "" msgstr "" #: bookwyrm/templates/lists/create_form.html:5 -#: bookwyrm/templates/lists/lists.html:14 +#: bookwyrm/templates/lists/lists.html:17 msgid "Create List" msgstr "" @@ -592,7 +625,7 @@ msgid "Discard" msgstr "" #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:15 +#: bookwyrm/templates/lists/list_layout.html:17 msgid "Edit List" msgstr "" @@ -670,165 +703,172 @@ msgid "Suggest" msgstr "" #: bookwyrm/templates/lists/list_items.html:19 -#: bookwyrm/templates/lists/list_layout.html:9 +#: bookwyrm/templates/lists/list_layout.html:11 msgid "Created and curated by" msgstr "" #: bookwyrm/templates/lists/list_items.html:19 -#: bookwyrm/templates/lists/list_layout.html:9 +#: bookwyrm/templates/lists/list_layout.html:11 msgid "Created by" msgstr "" -#: bookwyrm/templates/lists/lists.html:11 +#: bookwyrm/templates/lists/lists.html:14 msgid "Your lists" msgstr "" -#: bookwyrm/templates/lists/lists.html:37 +#: bookwyrm/templates/lists/lists.html:40 msgid "Recent Lists" msgstr "" -#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15 +#: bookwyrm/templates/login.html:4 +msgid "Login" +msgstr "" + +#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" msgstr "" -#: bookwyrm/templates/login.html:34 +#: bookwyrm/templates/login.html:36 msgid "Forgot your password?" msgstr "" -#: bookwyrm/templates/login.html:47 +#: bookwyrm/templates/login.html:49 msgid "Contact an administrator to get an invite" msgstr "" -#: bookwyrm/templates/login.html:57 +#: bookwyrm/templates/login.html:59 msgid "More about this site" msgstr "" -#: bookwyrm/templates/notfound.html:6 +#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8 msgid "Not Found" msgstr "" -#: bookwyrm/templates/notfound.html:7 +#: bookwyrm/templates/notfound.html:9 msgid "The page your requested doesn't seem to exist!" msgstr "" -#: bookwyrm/templates/notifications.html:11 +#: bookwyrm/templates/notifications.html:14 msgid "Delete notifications" msgstr "" -#: bookwyrm/templates/notifications.html:45 -#, python-format -msgid "favorited your %(preview_name)s" -msgstr "" - #: bookwyrm/templates/notifications.html:48 #, python-format -msgid "mentioned you in a %(preview_name)s" +msgid "favorited your %(preview_name)s" msgstr "" #: bookwyrm/templates/notifications.html:51 #, python-format +msgid "mentioned you in a %(preview_name)s" +msgstr "" + +#: bookwyrm/templates/notifications.html:54 +#, python-format msgid "" "replied to your " "%(preview_name)s" msgstr "" -#: bookwyrm/templates/notifications.html:54 +#: bookwyrm/templates/notifications.html:57 msgid "followed you" msgstr "" -#: bookwyrm/templates/notifications.html:57 +#: bookwyrm/templates/notifications.html:60 msgid "sent you a follow request" msgstr "" -#: bookwyrm/templates/notifications.html:62 +#: bookwyrm/templates/notifications.html:65 #, python-format msgid "boosted your %(preview_name)s" msgstr "" -#: bookwyrm/templates/notifications.html:64 +#: bookwyrm/templates/notifications.html:67 msgid "added" msgstr "" -#: bookwyrm/templates/notifications.html:64 +#: bookwyrm/templates/notifications.html:67 msgid "suggested adding" msgstr "" -#: bookwyrm/templates/notifications.html:67 +#: bookwyrm/templates/notifications.html:70 #, python-format msgid " your import completed." msgstr "" -#: bookwyrm/templates/notifications.html:99 +#: bookwyrm/templates/notifications.html:102 msgid "You're all caught up!" msgstr "" -#: bookwyrm/templates/password_reset.html:8 -#: bookwyrm/templates/password_reset_request.html:8 +#: bookwyrm/templates/password_reset.html:4 +#: bookwyrm/templates/password_reset.html:10 +#: bookwyrm/templates/password_reset_request.html:4 +#: bookwyrm/templates/password_reset_request.html:10 msgid "Reset Password" msgstr "" -#: bookwyrm/templates/password_reset.html:21 -#: bookwyrm/templates/preferences/change_password.html:15 +#: bookwyrm/templates/password_reset.html:23 +#: bookwyrm/templates/preferences/change_password.html:18 msgid "Confirm password:" msgstr "" -#: bookwyrm/templates/password_reset.html:28 +#: bookwyrm/templates/password_reset.html:30 msgid "Confirm" msgstr "" -#: bookwyrm/templates/password_reset_request.html:10 +#: bookwyrm/templates/password_reset_request.html:12 msgid "A link to reset your password will be sent to your email address" msgstr "" -#: bookwyrm/templates/password_reset_request.html:14 -#: bookwyrm/templates/preferences/edit_user.html:35 +#: bookwyrm/templates/password_reset_request.html:16 +#: bookwyrm/templates/preferences/edit_user.html:38 #: bookwyrm/templates/snippets/register_form.html:13 msgid "Email address:" msgstr "" -#: bookwyrm/templates/password_reset_request.html:21 +#: bookwyrm/templates/password_reset_request.html:23 msgid "Reset password" msgstr "" -#: bookwyrm/templates/preferences/blocks.html:5 +#: bookwyrm/templates/preferences/blocks.html:4 +#: bookwyrm/templates/preferences/blocks.html:7 +#: bookwyrm/templates/preferences/preferences_layout.html:23 msgid "Blocked Users" msgstr "" -#: bookwyrm/templates/preferences/blocks.html:10 +#: bookwyrm/templates/preferences/blocks.html:12 msgid "No users currently blocked." msgstr "" #: bookwyrm/templates/preferences/change_password.html:4 +#: bookwyrm/templates/preferences/change_password.html:7 +#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/preferences_layout.html:17 msgid "Change Password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:11 +#: bookwyrm/templates/preferences/change_password.html:14 msgid "New password:" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:18 -#: bookwyrm/templates/preferences/preferences_layout.html:17 -msgid "Change password" -msgstr "" - #: bookwyrm/templates/preferences/edit_user.html:4 +#: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:14 +#: bookwyrm/templates/preferences/edit_user.html:17 msgid "Avatar:" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:21 +#: bookwyrm/templates/preferences/edit_user.html:24 msgid "Display name:" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:28 +#: bookwyrm/templates/preferences/edit_user.html:31 msgid "Summary:" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:43 +#: bookwyrm/templates/preferences/edit_user.html:46 msgid "Manually approve followers:" msgstr "" @@ -840,96 +880,106 @@ msgstr "" msgid "Relationships" msgstr "" -#: bookwyrm/templates/preferences/preferences_layout.html:23 -msgid "Blocked users" +#: bookwyrm/templates/search_results.html:4 +msgid "Search Results" msgstr "" -#: bookwyrm/templates/search_results.html:6 +#: bookwyrm/templates/search_results.html:9 #, python-format msgid "Search Results for \"%(query)s\"" msgstr "" -#: bookwyrm/templates/search_results.html:11 +#: bookwyrm/templates/search_results.html:14 msgid "Matching Books" msgstr "" -#: bookwyrm/templates/search_results.html:14 +#: bookwyrm/templates/search_results.html:17 #, python-format msgid "No books found for \"%(query)s\"" msgstr "" -#: bookwyrm/templates/search_results.html:30 +#: bookwyrm/templates/search_results.html:33 msgid "Didn't find what you were looking for?" msgstr "" -#: bookwyrm/templates/search_results.html:32 +#: bookwyrm/templates/search_results.html:35 msgid "Show results from other catalogues" msgstr "" -#: bookwyrm/templates/search_results.html:54 +#: bookwyrm/templates/search_results.html:57 msgid "Import book" msgstr "" -#: bookwyrm/templates/search_results.html:64 +#: bookwyrm/templates/search_results.html:67 msgid "Hide results from other catalogues" msgstr "" -#: bookwyrm/templates/search_results.html:72 +#: bookwyrm/templates/search_results.html:75 msgid "Matching Users" msgstr "" -#: bookwyrm/templates/search_results.html:74 +#: bookwyrm/templates/search_results.html:77 #, python-format msgid "No users found for \"%(query)s\"" msgstr "" -#: bookwyrm/templates/search_results.html:89 +#: bookwyrm/templates/search_results.html:92 #, python-format msgid "No lists found for \"%(query)s\"" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:12 +#: bookwyrm/templates/settings/admin_layout.html:4 +msgid "Administration" +msgstr "" + +#: bookwyrm/templates/settings/admin_layout.html:15 msgid "Manage Users" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:20 -#: bookwyrm/templates/settings/federation.html:3 +#: bookwyrm/templates/settings/admin_layout.html:23 +#: bookwyrm/templates/settings/federation.html:4 msgid "Federated Servers" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:25 +#: bookwyrm/templates/settings/admin_layout.html:28 msgid "Instance Settings" msgstr "" #: bookwyrm/templates/settings/admin_layout.html:32 -#: bookwyrm/templates/settings/site.html:10 -msgid "Instance Info" -msgstr "" - -#: bookwyrm/templates/settings/admin_layout.html:33 -#: bookwyrm/templates/settings/site.html:36 -msgid "Images" -msgstr "" - -#: bookwyrm/templates/settings/admin_layout.html:34 -#: bookwyrm/templates/settings/site.html:56 -msgid "Footer Content" +#: bookwyrm/templates/settings/site.html:4 +#: bookwyrm/templates/settings/site.html:6 +msgid "Site Settings" msgstr "" #: bookwyrm/templates/settings/admin_layout.html:35 -#: bookwyrm/templates/settings/site.html:74 +#: bookwyrm/templates/settings/site.html:13 +msgid "Instance Info" +msgstr "" + +#: bookwyrm/templates/settings/admin_layout.html:36 +#: bookwyrm/templates/settings/site.html:39 +msgid "Images" +msgstr "" + +#: bookwyrm/templates/settings/admin_layout.html:37 +#: bookwyrm/templates/settings/site.html:59 +msgid "Footer Content" +msgstr "" + +#: bookwyrm/templates/settings/admin_layout.html:38 +#: bookwyrm/templates/settings/site.html:77 msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/federation.html:9 +#: bookwyrm/templates/settings/federation.html:10 msgid "Server name" msgstr "" -#: bookwyrm/templates/settings/federation.html:10 +#: bookwyrm/templates/settings/federation.html:11 msgid "Software" msgstr "" -#: bookwyrm/templates/settings/federation.html:11 +#: bookwyrm/templates/settings/federation.html:12 msgid "Status" msgstr "" @@ -969,55 +1019,55 @@ msgstr "" msgid "No active invites" msgstr "" -#: bookwyrm/templates/settings/site.html:12 +#: bookwyrm/templates/settings/site.html:15 msgid "Instance Name:" msgstr "" -#: bookwyrm/templates/settings/site.html:16 +#: bookwyrm/templates/settings/site.html:19 msgid "Tagline:" msgstr "" -#: bookwyrm/templates/settings/site.html:20 +#: bookwyrm/templates/settings/site.html:23 msgid "Instance description:" msgstr "" -#: bookwyrm/templates/settings/site.html:24 +#: bookwyrm/templates/settings/site.html:27 msgid "Code of conduct:" msgstr "" -#: bookwyrm/templates/settings/site.html:28 +#: bookwyrm/templates/settings/site.html:31 msgid "Privacy Policy:" msgstr "" -#: bookwyrm/templates/settings/site.html:39 +#: bookwyrm/templates/settings/site.html:42 msgid "Logo:" msgstr "" -#: bookwyrm/templates/settings/site.html:43 +#: bookwyrm/templates/settings/site.html:46 msgid "Logo small:" msgstr "" -#: bookwyrm/templates/settings/site.html:47 +#: bookwyrm/templates/settings/site.html:50 msgid "Favicon:" msgstr "" -#: bookwyrm/templates/settings/site.html:58 +#: bookwyrm/templates/settings/site.html:61 msgid "Support link:" msgstr "" -#: bookwyrm/templates/settings/site.html:62 +#: bookwyrm/templates/settings/site.html:65 msgid "Support title:" msgstr "" -#: bookwyrm/templates/settings/site.html:66 +#: bookwyrm/templates/settings/site.html:69 msgid "Admin email:" msgstr "" -#: bookwyrm/templates/settings/site.html:76 +#: bookwyrm/templates/settings/site.html:79 msgid "Allow registration:" msgstr "" -#: bookwyrm/templates/settings/site.html:80 +#: bookwyrm/templates/settings/site.html:83 msgid "Registration closed text:" msgstr "" @@ -1059,6 +1109,7 @@ msgid "Review" msgstr "" #: bookwyrm/templates/snippets/create_status.html:12 +#: bookwyrm/templates/snippets/create_status_form.html:44 msgid "Comment" msgstr "" @@ -1077,10 +1128,6 @@ msgstr "" msgid "No rating" msgstr "" -#: bookwyrm/templates/snippets/create_status_form.html:44 -msgid "Comment:" -msgstr "" - #: bookwyrm/templates/snippets/create_status_form.html:54 msgid "Include spoiler alert" msgstr "" @@ -1151,11 +1198,6 @@ msgid_plural "set a goal to read %(count)s books in %(year)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/snippets/goal_card.html:6 -#, python-format -msgid "%(year)s reading goal" -msgstr "" - #: bookwyrm/templates/snippets/goal_card.html:21 msgid "Dismiss message" msgstr "" @@ -1241,7 +1283,7 @@ msgid "Post privacy" msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:16 -#: bookwyrm/templates/user/followers.html:17 +#: bookwyrm/templates/user/followers.html:13 msgid "Followers" msgstr "" @@ -1467,7 +1509,7 @@ msgstr "" msgid "Remove tag" msgstr "" -#: bookwyrm/templates/tag.html:7 +#: bookwyrm/templates/tag.html:9 #, python-format msgid "Books tagged \"%(tag.name)s\"" msgstr "" @@ -1489,20 +1531,34 @@ msgstr "" msgid "Update shelf" msgstr "" -#: bookwyrm/templates/user/followers.html:30 +#: bookwyrm/templates/user/followers.html:7 +#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9 +msgid "User Profile" +msgstr "" + +#: bookwyrm/templates/user/followers.html:26 #, python-format msgid "%(username)s has no followers" msgstr "" -#: bookwyrm/templates/user/following.html:17 +#: bookwyrm/templates/user/following.html:13 msgid "Following" msgstr "" -#: bookwyrm/templates/user/following.html:30 +#: bookwyrm/templates/user/following.html:26 #, python-format msgid "%(username)s isn't following any users" msgstr "" +#: bookwyrm/templates/user/lists.html:9 +msgid "Your Lists" +msgstr "" + +#: bookwyrm/templates/user/lists.html:11 +#, python-format +msgid "Lists: %(username)s" +msgstr "" + #: bookwyrm/templates/user/lists.html:17 msgid "Create new list" msgstr "" @@ -1511,59 +1567,64 @@ msgstr "" msgid "Create list" msgstr "" +#: bookwyrm/templates/user/shelf.html:9 +msgid "Your Shelves" +msgstr "" + +#: bookwyrm/templates/user/shelf.html:11 +#, python-format +msgid "%(username)s: Shelves" +msgstr "" + #: bookwyrm/templates/user/shelf.html:54 msgid "Edit shelf" msgstr "" -#: bookwyrm/templates/user/user.html:7 -msgid "User profile" -msgstr "" - -#: bookwyrm/templates/user/user.html:13 +#: bookwyrm/templates/user/user.html:15 msgid "Edit profile" msgstr "" -#: bookwyrm/templates/user/user.html:24 -#: bookwyrm/templates/user/user_layout.html:66 +#: bookwyrm/templates/user/user.html:26 +#: bookwyrm/templates/user/user_layout.html:68 msgid "Shelves" msgstr "" -#: bookwyrm/templates/user/user.html:29 +#: bookwyrm/templates/user/user.html:31 #, python-format msgid "See all %(size)s" msgstr "" -#: bookwyrm/templates/user/user.html:42 +#: bookwyrm/templates/user/user.html:44 #, python-format msgid "See all %(shelf_count)s shelves" msgstr "" -#: bookwyrm/templates/user/user.html:54 +#: bookwyrm/templates/user/user.html:56 #, python-format msgid "Set a reading goal for %(year)s" msgstr "" -#: bookwyrm/templates/user/user.html:60 +#: bookwyrm/templates/user/user.html:62 msgid "User Activity" msgstr "" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:65 msgid "RSS feed" msgstr "" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:76 msgid "No activities yet!" msgstr "" -#: bookwyrm/templates/user/user_layout.html:30 +#: bookwyrm/templates/user/user_layout.html:32 msgid "Follow Requests" msgstr "" -#: bookwyrm/templates/user/user_layout.html:48 +#: bookwyrm/templates/user/user_layout.html:50 msgid "Activity" msgstr "" -#: bookwyrm/templates/user/user_layout.html:54 +#: bookwyrm/templates/user/user_layout.html:56 msgid "Reading Goal" msgstr ""