From fd56379518f93aa56dcb2e1a64f51fc2a400cc47 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 9 Aug 2021 07:38:43 -0700 Subject: [PATCH 1/5] Updates rss feed view --- bookwyrm/tests/views/test_rss_feed.py | 65 ++++++++++++--------------- bookwyrm/views/rss_feed.py | 15 ++++++- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 3608b043..715add3f 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -1,5 +1,4 @@ """ testing import """ - from unittest.mock import patch from django.test import RequestFactory, TestCase @@ -7,57 +6,51 @@ from bookwyrm import models from bookwyrm.views import rss_feed +@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") +@patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream") +@patch("bookwyrm.activitystreams.ActivityStream.add_status") class RssFeedView(TestCase): """rss feed behaves as expected""" - def setUp(self): - """test data""" - self.site = models.SiteSettings.objects.create() + def test_rss_feed(self, *_): + """load an rss feed""" + models.SiteSettings.objects.create() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): - self.user = models.User.objects.create_user( - "rss_user", "rss@test.rss", "password", local=True - ) + user = models.User.objects.create_user( + "rss_user", "rss@test.rss", "password", local=True + ) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.review = models.Review.objects.create( - name="Review name", - content="test content", - rating=3, - user=self.user, - book=self.book, - ) + models.Review.objects.create( + name="Review name", + content="test content", + rating=3, + user=user, + book=book, + ) - self.quote = models.Quotation.objects.create( - quote="a sickening sense", - content="test content", - user=self.user, - book=self.book, - ) + models.Quotation.objects.create( + quote="a sickening sense", + content="test content", + user=user, + book=book, + ) - self.generatednote = models.GeneratedNote.objects.create( - content="test content", user=self.user - ) + models.ReadStatus.objects.create(content="test content", user=user) - self.factory = RequestFactory() + factory = RequestFactory() - @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream") - def test_rss_feed(self, _): - """load an rss feed""" view = rss_feed.RssFeed() - request = self.factory.get("/user/rss_user/rss") - request.user = self.user - with patch("bookwyrm.models.SiteSettings.objects.get") as site: - site.return_value = self.site - result = view(request, username=self.user.username) + request = factory.get("/user/rss_user/rss") + request.user = user + + result = view(request, username=user.username) self.assertEqual(result.status_code, 200) self.assertIn(b"Status updates from rss_user", result.content) diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py index 0d3a8902..5faa1624 100644 --- a/bookwyrm/views/rss_feed.py +++ b/bookwyrm/views/rss_feed.py @@ -1,6 +1,9 @@ """ serialize user's posts in rss feed """ from django.contrib.syndication.views import Feed +from django.template.loader import get_template +from django.utils.translation import gettext_lazy as _ + from .helpers import get_user_from_username, privacy_filter # pylint: disable=no-self-use, unused-argument @@ -8,7 +11,15 @@ class RssFeed(Feed): """serialize user's posts in rss feed""" description_template = "rss/content.html" - title_template = "rss/title.html" + + def item_title(self, item): + """render the item title""" + if hasattr(item, "pure_name") and item.pure_name: + return item.pure_name + title_template = get_template("snippets/status/header_content.html") + title = title_template.render({"status": item}) + template = get_template("rss/title.html") + return template.render({"user": item.user, "item_title": title}).strip() def get_object(self, request, username): # pylint: disable=arguments-differ """the user who's posts get serialized""" @@ -20,7 +31,7 @@ class RssFeed(Feed): def title(self, obj): """title of the rss feed entry""" - return f"Status updates from {obj.display_name}" + return _(f"Status updates from {obj.display_name}") def items(self, obj): """the user's activity feed""" From dd54473a30023f4c6dc477f0f299530b3e7f46be Mon Sep 17 00:00:00 2001 From: GuDzpoz Date: Sun, 15 Aug 2021 22:58:36 +0800 Subject: [PATCH 2/5] Updated Simplified Chinese translation; fixed a few typos and unified several punctuation styles. --- locale/zh_Hans/LC_MESSAGES/django.mo | Bin 41731 -> 45867 bytes locale/zh_Hans/LC_MESSAGES/django.po | 183 +++++++++++---------------- 2 files changed, 72 insertions(+), 111 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index 13ee2ab0340057533d0fb8890c6759f3701f6fc7..dbe69686f8f0510405b134346451d40a2258abcc 100644 GIT binary patch delta 17864 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

>-ZCC4XGCGK6JyO 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 diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 9ece3e74..54712649 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -101,10 +101,8 @@ msgid "Home" msgstr "主页" #: bookwyrm/settings.py:124 -#, fuzzy -#| msgid "Book Title" msgid "Books Timeline" -msgstr "书名" +msgstr "书目时间线" #: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 @@ -446,7 +444,7 @@ msgstr "从网址加载封面:" #: bookwyrm/templates/book/edit_book.html:11 #, python-format msgid "Edit \"%(book_title)s\"" -msgstr "编辑 \"%(book_title)s\"" +msgstr "编辑《%(book_title)s》" #: bookwyrm/templates/book/edit_book.html:5 #: bookwyrm/templates/book/edit_book.html:13 @@ -460,7 +458,7 @@ msgstr "确认书目信息" #: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" -msgstr "\"%(name)s\" 是已存在的作者吗？" +msgstr "“%(name)s” 是已存在的作者吗？" #: bookwyrm/templates/book/edit_book.html:71 #, python-format @@ -474,7 +472,7 @@ msgstr "这是一位新的作者" #: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" -msgstr "正在创建新的作者: %(name)s" +msgstr "正在创建新的作者: %(name)s" #: bookwyrm/templates/book/edit_book.html:89 msgid "Is this an edition of an existing work?" @@ -591,7 +589,7 @@ msgstr "%(book_title)s 的各版本" #: bookwyrm/templates/book/editions.html:8 #, python-format msgid "Editions of \"%(work_title)s\"" -msgstr "\"%(work_title)s\" 的各版本" +msgstr "《%(work_title)s》 的各版本" #: bookwyrm/templates/book/format_filter.html:8 #: bookwyrm/templates/book/language_filter.html:8 @@ -685,30 +683,24 @@ msgid "Compose status" msgstr "撰写状态" #: bookwyrm/templates/confirm_email/confirm_email.html:4 -#, fuzzy -#| msgid "Confirm" msgid "Confirm email" -msgstr "确认" +msgstr "确认邮箱" #: bookwyrm/templates/confirm_email/confirm_email.html:7 -#, fuzzy -#| msgid "Email address:" msgid "Confirm your email address" -msgstr "邮箱地址:" +msgstr "确认你的邮箱地址:" #: bookwyrm/templates/confirm_email/confirm_email.html:13 msgid "A confirmation code has been sent to the email address you used to register your account." -msgstr "" +msgstr "确认码已经被发送到了你注册时所使用的邮箱地址。" #: bookwyrm/templates/confirm_email/confirm_email.html:15 msgid "Sorry! We couldn't find that code." -msgstr "" +msgstr "抱歉！我们无法找到该代码。" #: bookwyrm/templates/confirm_email/confirm_email.html:19 -#, fuzzy -#| msgid "Confirm password:" msgid "Confirmation code:" -msgstr "确认密码:" +msgstr "确认代码:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/landing_layout.html:70 @@ -718,11 +710,11 @@ msgstr "提交" #: bookwyrm/templates/confirm_email/confirm_email.html:32 msgid "Can't find your code?" -msgstr "" +msgstr "找不到你的代码？" #: bookwyrm/templates/confirm_email/resend_form.html:4 msgid "Resend confirmation link" -msgstr "" +msgstr "重新发送确认链接" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/landing_layout.html:64 @@ -733,10 +725,8 @@ msgid "Email address:" msgstr "邮箱地址:" #: bookwyrm/templates/confirm_email/resend_form.html:17 -#, fuzzy -#| msgid "Re-send invite" msgid "Resend link" -msgstr "重新发送请求" +msgstr "重新发送链接" #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" @@ -787,10 +777,8 @@ msgstr "最近活跃" #: bookwyrm/templates/directory/user_card.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 -#, fuzzy -#| msgid "Your Account" msgid "Locked account" -msgstr "你的帐号" +msgstr "帐号已上锁" #: bookwyrm/templates/directory/user_card.html:40 msgid "follower you follow" @@ -825,15 +813,13 @@ msgstr "所有已知用户" #: bookwyrm/templates/discover/discover.html:4 #: bookwyrm/templates/discover/discover.html:10 #: bookwyrm/templates/layout.html:71 -#, fuzzy -#| msgid "Discard" msgid "Discover" -msgstr "削除" +msgstr "发现" #: bookwyrm/templates/discover/discover.html:12 #, python-format msgid "See what's new in the local %(site_name)s community" -msgstr "" +msgstr "看看本地 %(site_name)s 社区的新消息" #: bookwyrm/templates/discover/large-book.html:46 #: bookwyrm/templates/discover/small-book.html:32 @@ -857,36 +843,32 @@ msgstr "引用了" #: bookwyrm/templates/discover/large-book.html:68 #: bookwyrm/templates/discover/small-book.html:52 -#, fuzzy -#| msgid "Like status" msgid "View status" -msgstr "喜欢状态" +msgstr "浏览状态" #: bookwyrm/templates/email/confirm/html_content.html:6 #: bookwyrm/templates/email/confirm/text_content.html:4 #, python-format msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" -msgstr "" +msgstr "在加入 %(site_name)s 前的最后一步！请点击以下链接以确认你的邮箱:" #: bookwyrm/templates/email/confirm/html_content.html:11 -#, fuzzy -#| msgid "Confirm" msgid "Confirm Email" -msgstr "确认" +msgstr "确认邮箱" #: bookwyrm/templates/email/confirm/html_content.html:15 #, python-format msgid "Or enter the code \"%(confirmation_code)s\" at login." -msgstr "" +msgstr "或者在登录时输入代码 “%(confirmation_code)s”。" #: bookwyrm/templates/email/confirm/subject.html:2 msgid "Please confirm your email" -msgstr "" +msgstr "请确认你的邮箱" #: bookwyrm/templates/email/confirm/text_content.html:10 #, python-format msgid "Or enter the code \"%(confirmation_code)s\" at login." -msgstr "" +msgstr "或者在登录时输入代码 “%(confirmation_code)s”。" #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 @@ -969,10 +951,9 @@ msgid "You have no messages right now." msgstr "你现在没有消息。" #: bookwyrm/templates/feed/feed.html:22 -#, fuzzy, python-format -#| msgid "load 0 unread status(es)" +#, python-format msgid "load 0 unread status(es)" -msgstr "加载 0 条未读状态" +msgstr "加载 0 条未读状态" #: bookwyrm/templates/feed/feed.html:38 msgid "There aren't any activities right now! Try following a user to get started" @@ -1447,7 +1428,7 @@ msgstr "联系站点管理员" #: bookwyrm/templates/layout.html:226 msgid "Documentation" -msgstr "文档:" +msgstr "文档" #: bookwyrm/templates/layout.html:233 #, python-format @@ -1591,7 +1572,7 @@ msgstr "清除搜索" #: bookwyrm/templates/lists/list.html:151 #, python-format msgid "No books found matching the query \"%(query)s\"" -msgstr "没有符合 \"%(query)s\" 请求的书目" +msgstr "没有符合 “%(query)s” 请求的书目" #: bookwyrm/templates/lists/list.html:179 msgid "Suggest" @@ -1607,7 +1588,7 @@ msgstr "登录" #: bookwyrm/templates/login.html:16 msgid "Success! Email address confirmed." -msgstr "" +msgstr "成功！邮箱地址已确认。" #: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 @@ -1811,13 +1792,13 @@ msgstr "转发了你的 状态" #: bookwyrm/templates/notifications.html:121 #, python-format -msgid " added %(book_title)s to your list \"%(list_name)s\"" -msgstr " 添加了 %(book_title)s 到你的列表 \"%(list_name)s\"" +msgid " added %(book_title)s to your list “%(list_name)s”" +msgstr " 添加了 %(book_title)s 到你的列表 “%(list_name)s”" #: bookwyrm/templates/notifications.html:123 #, python-format msgid " suggested adding %(book_title)s to your list \"%(list_name)s\"" -msgstr " 推荐添加 %(book_title)s 到你的列表 \"%(list_name)s\"" +msgstr " 推荐添加 %(book_title)s 到你的列表 “%(list_name)s”" #: bookwyrm/templates/notifications.html:128 #, python-format @@ -1893,10 +1874,8 @@ msgid "Show set reading goal prompt in feed:" msgstr "在消息流中显示设置阅读目标的提示:" #: bookwyrm/templates/preferences/edit_user.html:58 -#, fuzzy -#| msgid "Post privacy" msgid "Default post privacy:" -msgstr "发文隐私" +msgstr "默认发文隐私:" #: bookwyrm/templates/preferences/edit_user.html:70 #, python-format @@ -1922,17 +1901,17 @@ msgstr "关系" #: bookwyrm/templates/reading_progress/finish.html:5 #, python-format msgid "Finish \"%(book_title)s\"" -msgstr "完成 \"%(book_title)s\"" +msgstr "完成《%(book_title)s》" #: bookwyrm/templates/reading_progress/start.html:5 #, python-format msgid "Start \"%(book_title)s\"" -msgstr "开始 \"%(book_title)s\"" +msgstr "开始《%(book_title)s》" #: bookwyrm/templates/reading_progress/want.html:5 #, python-format msgid "Want to Read \"%(book_title)s\"" -msgstr "想要阅读 \"%(book_title)s\"" +msgstr "想要阅读《%(book_title)s》" #: bookwyrm/templates/search/book.html:64 msgid "Load results from other catalogues" @@ -1944,7 +1923,7 @@ msgstr "手动添加书目" #: bookwyrm/templates/search/book.html:73 msgid "Log in to import or add books." -msgstr "登陆以导入或添加书目。" +msgstr "登录以导入或添加书目。" #: bookwyrm/templates/search/layout.html:16 msgid "Search query" @@ -1965,7 +1944,7 @@ msgstr "用户" #: bookwyrm/templates/search/layout.html:58 #, python-format msgid "No results found for \"%(query)s\"" -msgstr "没有找到 \"%(query)s\" 的搜索结果" +msgstr "没有找到 “%(query)s” 的搜索结果" #: bookwyrm/templates/settings/admin_layout.html:4 msgid "Administration" @@ -2414,11 +2393,11 @@ msgstr "允许请求邀请" #: bookwyrm/templates/settings/site.html:97 msgid "Require users to confirm email address" -msgstr "" +msgstr "要求用户确认邮箱地址" #: bookwyrm/templates/settings/site.html:99 msgid "(Recommended if registration is open)" -msgstr "" +msgstr "（当开放注册时推荐）" #: bookwyrm/templates/settings/site.html:102 msgid "Registration closed text:" @@ -2433,15 +2412,14 @@ msgstr "由 %(username)s 发布" #, python-format msgid "and %(remainder_count_display)s other" msgid_plural "and %(remainder_count_display)s others" -msgstr[0] "" +msgstr[0] "与其它 %(remainder_count_display)s 位" #: bookwyrm/templates/snippets/book_cover.html:32 msgid "No cover" msgstr "没有封面" #: bookwyrm/templates/snippets/book_titleby.html:6 -#, fuzzy, python-format -#| msgid "%(title)s by " +#, python-format msgid "%(title)s by" msgstr "%(title)s 来自" @@ -2465,7 +2443,7 @@ msgstr "引用" #: bookwyrm/templates/snippets/create_status/comment.html:15 msgid "Some thoughts on the book" -msgstr "" +msgstr "对书的一些看法" #: bookwyrm/templates/snippets/create_status/comment.html:26 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 @@ -2533,16 +2511,14 @@ msgid "Quote:" msgstr "引用:" #: bookwyrm/templates/snippets/create_status/quotation.html:27 -#, fuzzy, python-format -#| msgid "Start \"%(book_title)s\"" +#, python-format msgid "An excerpt from '%(book_title)s'" -msgstr "开始 \"%(book_title)s\"" +msgstr "摘自《%(book_title)s》的节录" #: bookwyrm/templates/snippets/create_status/review.html:20 -#, fuzzy, python-format -#| msgid "Editions of %(book_title)s" +#, python-format msgid "Your review of '%(book_title)s'" -msgstr "%(book_title)s 的各版本" +msgstr "你对《%(book_title)s》的书评" #: bookwyrm/templates/snippets/create_status/review.html:32 msgid "Review:" @@ -2584,10 +2560,9 @@ msgid "Clear filters" msgstr "清除过滤器" #: bookwyrm/templates/snippets/follow_button.html:14 -#, fuzzy, python-format -#| msgid "Report @%(username)s" +#, python-format msgid "Follow @%(username)s" -msgstr "报告 %(username)s" +msgstr "关注 @%(username)s" #: bookwyrm/templates/snippets/follow_button.html:16 msgid "Follow" @@ -2598,10 +2573,9 @@ msgid "Undo follow request" msgstr "撤回关注请求" #: bookwyrm/templates/snippets/follow_button.html:30 -#, fuzzy, python-format -#| msgid "Report @%(username)s" +#, python-format msgid "Unfollow @%(username)s" -msgstr "报告 %(username)s" +msgstr "取消关注 @%(username)s" #: bookwyrm/templates/snippets/follow_button.html:32 msgid "Unfollow" @@ -2630,9 +2604,7 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s" msgstr[0] "设定了在 %(year)s 内要读 %(counter)s 本书的目标" #: bookwyrm/templates/snippets/generated_status/rating.html:3 -#, fuzzy, python-format -#| msgid "Rated %(title)s: %(display_rating)s star" -#| msgid_plural "Rated %(title)s: %(display_rating)s stars" +#, python-format msgid "rated %(title)s: %(display_rating)s star" msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "为 %(title)s 打了分: %(display_rating)s 星" @@ -2641,12 +2613,12 @@ msgstr[0] "为 %(title)s 打了分: %(display_ #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" -msgstr[0] "\"%(book_title)s\" 的书评（%(display_rating)s 星）: %(review_title)s" +msgstr[0] "《%(book_title)s》的书评（%(display_rating)s 星）: %(review_title)s" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8 #, python-format msgid "Review of \"%(book_title)s\": %(review_title)s" -msgstr "\"%(book_title)s\" 的书评: %(review_title)s" +msgstr "《%(book_title)s》的书评: %(review_title)s" #: bookwyrm/templates/snippets/goal_card.html:23 #, python-format @@ -2777,7 +2749,7 @@ msgstr "移动书目" #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 #, python-format msgid "Finish \"%(book_title)s\"" -msgstr "完成 \"%(book_title)s\"" +msgstr "完成《%(book_title)s》" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 @@ -2809,12 +2781,12 @@ msgstr "从 %(name)s 移除" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 #, python-format msgid "Start \"%(book_title)s\"" -msgstr "开始 \"%(book_title)s\"" +msgstr "开始《%(book_title)s》" #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 #, python-format msgid "Want to Read \"%(book_title)s\"" -msgstr "想要阅读 \"%(book_title)s\"" +msgstr "想要阅读《%(book_title)s》" #: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:17 @@ -2831,10 +2803,9 @@ msgid "Open image in new window" msgstr "在新窗口中打开图像" #: bookwyrm/templates/snippets/status/headers/comment.html:2 -#, fuzzy, python-format -#| msgid "Editions of \"%(work_title)s\"" +#, python-format msgid "commented on %(book)s" -msgstr "\"%(work_title)s\" 的各版本" +msgstr "评论了 %(book)s" #: bookwyrm/templates/snippets/status/headers/note.html:15 #, python-format @@ -2842,40 +2813,35 @@ msgid "replied to %(username)s's %(username)s 的 状态" #: bookwyrm/templates/snippets/status/headers/quotation.html:2 -#, fuzzy, python-format +#, python-format #| msgid "Reported by %(username)s" msgid "quoted %(book)s" -msgstr "由 %(username)s 报告" +msgstr "引用了 %(book)s" #: bookwyrm/templates/snippets/status/headers/rating.html:3 -#, fuzzy, python-format -#| msgid "Created by %(username)s" +#, python-format msgid "rated %(book)s:" -msgstr "由 %(username)s 创建" +msgstr "为 %(book)s 打了分:" #: bookwyrm/templates/snippets/status/headers/read.html:5 -#, fuzzy, python-format -#| msgid "Editions of \"%(work_title)s\"" +#, python-format msgid "finished reading %(book)s" -msgstr "\"%(work_title)s\" 的各版本" +msgstr "完成阅读 %(book)s" #: bookwyrm/templates/snippets/status/headers/reading.html:6 -#, fuzzy, python-format -#| msgid "Created by %(username)s" +#, python-format msgid "started reading %(book)s" -msgstr "由 %(username)s 创建" +msgstr "开始阅读 %(book)s" #: bookwyrm/templates/snippets/status/headers/review.html:3 -#, fuzzy, python-format -#| msgid "Created by %(username)s" +#, python-format msgid "reviewed %(book)s" -msgstr "由 %(username)s 创建" +msgstr "为 %(book)s 撰写了书评" #: bookwyrm/templates/snippets/status/headers/to_read.html:6 -#, fuzzy, python-format -#| msgid "replied to %(username)s's status" +#, python-format msgid "%(username)s wants to read %(book)s" -msgstr "回复了 %(username)s 的 状态" +msgstr "%(username)s 想要阅读 %(book)s" #: bookwyrm/templates/snippets/status/layout.html:21 #: bookwyrm/templates/snippets/status/status_options.html:17 @@ -2925,10 +2891,8 @@ msgstr[0] "%(shared_books)s 本在你书架上也有的书" #: bookwyrm/templates/snippets/suggested_users.html:31 #: bookwyrm/templates/user/user_preview.html:36 -#, fuzzy -#| msgid "followed you" msgid "Follows you" -msgstr "关注了你" +msgstr "正在关注着你" #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" @@ -3079,11 +3043,8 @@ msgid_plural "%(mutuals_display)s followers you follow" msgstr[0] "%(mutuals_display)s 个你也关注的关注者" #: bookwyrm/templates/user/user_preview.html:38 -#, fuzzy -#| msgid "follower you follow" -#| msgid_plural "followers you follow" msgid "No followers you follow" -msgstr "你关注的关注者" +msgstr "没有你关注的关注者" #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" @@ -3167,7 +3128,7 @@ msgstr "%(title)s：%(subtitle)s" #: bookwyrm/views/authentication.py:69 msgid "Username or password are incorrect" -msgstr "" +msgstr "用户名或密码不正确" #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" From 71404fae0683f77a5001b30896e055e46f98a8ae Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 16 Aug 2021 08:51:23 -0700 Subject: [PATCH 3/5] Adds local only filter to user admin view --- bookwyrm/templates/user_admin/user_admin_filters.html | 1 + bookwyrm/views/user_admin.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/bookwyrm/templates/user_admin/user_admin_filters.html b/bookwyrm/templates/user_admin/user_admin_filters.html index 57e017e5..5283b4e9 100644 --- a/bookwyrm/templates/user_admin/user_admin_filters.html +++ b/bookwyrm/templates/user_admin/user_admin_filters.html @@ -3,4 +3,5 @@ {% block filter_fields %} {% include 'user_admin/server_filter.html' %} {% include 'user_admin/username_filter.html' %} +{% include 'directory/community_filter.html' %} {% endblock %} diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py index 9d08e930..7cfefb0f 100644 --- a/bookwyrm/views/user_admin.py +++ b/bookwyrm/views/user_admin.py @@ -30,6 +30,9 @@ class UserAdminList(View): username = request.GET.get("username") if username: filters["username__icontains"] = username + scope = request.GET.get("scope") + if scope: + filters["local"] = scope == "local" users = models.User.objects.filter(**filters) From 7345b85ebde8f18c3c65e150aec0b6e4f360345c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 16 Aug 2021 10:25:21 -0700 Subject: [PATCH 4/5] Granular RSS tests --- bookwyrm/tests/views/test_rss_feed.py | 77 ++++++++++++++++++--------- 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 715add3f..69a9ef02 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -12,47 +12,76 @@ from bookwyrm.views import rss_feed class RssFeedView(TestCase): """rss feed behaves as expected""" - def test_rss_feed(self, *_): - """load an rss feed""" - models.SiteSettings.objects.create() - - user = models.User.objects.create_user( - "rss_user", "rss@test.rss", "password", local=True - ) - + def setUp(self): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): + self.local_user = models.User.objects.create_user( + "rss_user", "rss@test.rss", "password", local=True + ) work = models.Work.objects.create(title="Test Work") - book = models.Edition.objects.create( + self.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, ) + self.factory = RequestFactory() + models.SiteSettings.objects.create() + + + def test_rss_empty(self, *_): + """load an rss feed""" + view = rss_feed.RssFeed() + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) + self.assertEqual(result.status_code, 200) + self.assertIn(b"Status updates from rss_user", result.content) + result.render() + + def test_rss_comment(self, *_): + """load an rss feed""" + models.Comment.objects.create( + content="comment test content", + user=self.local_user, + book=self.book, + ) + view = rss_feed.RssFeed() + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) + self.assertEqual(result.status_code, 200) + self.assertIn(b"Example Edition", result.content) + result.render() + + def test_rss_review(self, *_): + """load an rss feed""" models.Review.objects.create( name="Review name", content="test content", rating=3, - user=user, - book=book, + user=self.local_user, + book=self.book, ) + view = rss_feed.RssFeed() + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) + self.assertEqual(result.status_code, 200) + result.render() + def test_rss_quotation(self, *_): + """load an rss feed""" models.Quotation.objects.create( quote="a sickening sense", content="test content", - user=user, - book=book, + user=self.local_user, + book=self.book, ) - - models.ReadStatus.objects.create(content="test content", user=user) - - factory = RequestFactory() - view = rss_feed.RssFeed() - request = factory.get("/user/rss_user/rss") - request.user = user - - result = view(request, username=user.username) + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) + result.render() - self.assertIn(b"Status updates from rss_user", result.content) self.assertIn(b"a sickening sense", result.content) - self.assertIn(b"Example Edition", result.content) From 5de3c75de36351f0b63f29e1bad7226b0ed22e5c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 16 Aug 2021 10:28:32 -0700 Subject: [PATCH 5/5] Remove render from tests --- bookwyrm/tests/views/test_rss_feed.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 69a9ef02..f2d3baf2 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -27,7 +27,6 @@ class RssFeedView(TestCase): models.SiteSettings.objects.create() - def test_rss_empty(self, *_): """load an rss feed""" view = rss_feed.RssFeed() @@ -36,7 +35,6 @@ class RssFeedView(TestCase): result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) self.assertIn(b"Status updates from rss_user", result.content) - result.render() def test_rss_comment(self, *_): """load an rss feed""" @@ -51,7 +49,6 @@ class RssFeedView(TestCase): result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) self.assertIn(b"Example Edition", result.content) - result.render() def test_rss_review(self, *_): """load an rss feed""" @@ -67,7 +64,6 @@ class RssFeedView(TestCase): request.user = self.local_user result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) - result.render() def test_rss_quotation(self, *_): """load an rss feed""" @@ -82,6 +78,5 @@ class RssFeedView(TestCase): request.user = self.local_user result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) - result.render() self.assertIn(b"a sickening sense", result.content)