yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moves titles into templates and adds i18n support

Browse Source
This commit is contained in:
Mouse Reeve
2021-02-28 10:00:36 -08:00
parent c4116c93b7
commit c483768544
55 changed files with 121 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bookwyrm/views/authentication.py
View File

@ -21,7 +21,6 @@ class Login(View):
return redirect('/')
# sene user to the login page
data = {
'title': 'Login',
'login_form': forms.LoginForm(),
'register_form': forms.RegisterForm(),
}

3
bookwyrm/views/author.py
View File

@ -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
}

3
bookwyrm/views/block.py
View File

@ -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 '''

4
bookwyrm/views/books.py
View File

@ -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,
}

6
bookwyrm/views/error.py
View File

@ -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)

5
bookwyrm/views/federation.py
View File

@ -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)

3
bookwyrm/views/feed.py
View File

@ -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)

2
bookwyrm/views/goal.py
View File

@ -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,

2
bookwyrm/views/import_data.py
View File

@ -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,

3
bookwyrm/views/invite.py
View File

@ -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,

6
bookwyrm/views/landing.py
View File

@ -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)),
}

4
bookwyrm/views/list.py
View File

@ -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),

1
bookwyrm/views/notifications.py
View File

@ -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,
}

12
bookwyrm/views/password.py
View File

@ -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)

1
bookwyrm/views/search.py
View File

@ -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,

1
bookwyrm/views/shelf.py
View File

@ -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(),

10
bookwyrm/views/site.py
View File

@ -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()

1
bookwyrm/views/tag.py
View File

@ -25,7 +25,6 @@ class Tag(View):
usertag__tag__identifier=tag_id
).distinct()
data = {
'title': tag_obj.name,
'books': books,
'tag': tag_obj,
}

4
bookwyrm/views/user.py
View File

@ -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,
}