From 3ffe8a2ffbdf09770d557e1e0c7acef521dc3af7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Apr 2021 12:10:21 -0700 Subject: [PATCH 1/6] Uses date input type for publication date fields --- bookwyrm/templates/book/edit_book.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html index d7c842351..a9ce651e7 100644 --- a/bookwyrm/templates/book/edit_book.html +++ b/bookwyrm/templates/book/edit_book.html @@ -122,12 +122,18 @@

{{ error | escape }}

{% endfor %} -

{{ form.first_published_date }}

+

+ + +

{% for error in form.first_published_date.errors %}

{{ error | escape }}

{% endfor %} -

{{ form.published_date }}

+

+ + +

{% for error in form.published_date.errors %}

{{ error | escape }}

{% endfor %} From 74ca54d8d63fff02e4fca6fab4b9051d4196dbd9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Apr 2021 20:55:44 -0700 Subject: [PATCH 2/6] Fixes goal page book link --- bookwyrm/templates/goal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html index fef1438be..1e10144ff 100644 --- a/bookwyrm/templates/goal.html +++ b/bookwyrm/templates/goal.html @@ -57,7 +57,7 @@ {% for book in goal.books %}
- {% include 'snippets/book_cover.html' with book=book.book %} + {% include 'snippets/book_cover.html' with book=book.book %}
{% endfor %} From cfb0d0954b7d450a0e7e27de97ab03a1da32a322 Mon Sep 17 00:00:00 2001 From: GuDzpoz Date: Sun, 4 Apr 2021 12:20:16 +0800 Subject: [PATCH 3/6] Updated Simplified Chinese translation --- locale/zh_CN/LC_MESSAGES/django.mo | Bin 29305 -> 38410 bytes locale/zh_CN/LC_MESSAGES/django.po | 520 +++++++++++------------------ 2 files changed, 203 insertions(+), 317 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index 3fe34104efbb6b6c4305cf3dd4c6ca9656766dde..bdfaaef855d82416fa6673b122350d5b1cdde240 100644 GIT binary patch literal 38410 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 AhX4Qo diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index b05b8d27f..a95135d14 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-01 13:14-0700\n" +"POT-Creation-Date: 2021-04-04 04:17+0000\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -19,10 +19,8 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: bookwyrm/forms.py:226 -#, fuzzy -#| msgid "A user with that username already exists." msgid "A user with this email already exists." -msgstr "已经存在使用该用户名的用户。" +msgstr "已经存在使用该邮箱的用户。" #: bookwyrm/forms.py:240 msgid "One Day" @@ -59,7 +57,7 @@ msgstr "%(value)s 不是有效的 remote_id" msgid "%(value)s is not a valid username" msgstr "%(value)s 不是有效的用户名" -#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157 +#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152 msgid "username" msgstr "用户名" @@ -136,10 +134,8 @@ msgid "Add cover" msgstr "添加封面" #: bookwyrm/templates/book/book.html:53 -#, fuzzy -#| msgid "Failed to load" msgid "Failed to load cover" -msgstr "加载失败" +msgstr "加载封面失败" #: bookwyrm/templates/book/book.html:62 msgid "ISBN:" @@ -180,7 +176,7 @@ msgstr "描述:" #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 #: bookwyrm/templates/settings/site.html:93 -#: bookwyrm/templates/snippets/readthrough.html:65 +#: bookwyrm/templates/snippets/readthrough.html:75 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34 @@ -194,7 +190,7 @@ msgstr "保存" #: bookwyrm/templates/moderation/report_modal.html:32 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 -#: bookwyrm/templates/snippets/readthrough.html:66 +#: bookwyrm/templates/snippets/readthrough.html:76 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35 @@ -441,11 +437,11 @@ msgstr "\"%(work_title)s\" 的各版本" #: bookwyrm/templates/book/format_filter.html:8 #: bookwyrm/templates/book/language_filter.html:8 msgid "Any" -msgstr "" +msgstr "所有" #: bookwyrm/templates/book/language_filter.html:5 msgid "Language:" -msgstr "" +msgstr "语言:" #: bookwyrm/templates/book/publisher_info.html:6 #, python-format @@ -458,10 +454,9 @@ msgid "%(pages)s pages" msgstr "%(pages)s 页" #: bookwyrm/templates/book/publisher_info.html:13 -#, fuzzy, python-format -#| msgid "%(pages)s pages" +#, python-format msgid "%(languages)s language" -msgstr "%(pages)s 页" +msgstr "%(languages)s 语言" #: bookwyrm/templates/book/publisher_info.html:18 #, python-format @@ -487,38 +482,31 @@ msgid "Close" msgstr "关闭" #: bookwyrm/templates/directory/community_filter.html:5 -#, fuzzy -#| msgid "Comment" msgid "Community" -msgstr "评论" +msgstr "社区" #: bookwyrm/templates/directory/community_filter.html:8 -#, fuzzy -#| msgid "Max uses" msgid "Local users" -msgstr "最大使用次数" +msgstr "本地用户" #: bookwyrm/templates/directory/community_filter.html:12 -#, fuzzy -#| msgid "Federated" msgid "Federated community" -msgstr "跨站" +msgstr "跨站社区" #: bookwyrm/templates/directory/directory.html:6 #: bookwyrm/templates/directory/directory.html:11 -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/layout.html:92 msgid "Directory" -msgstr "" +msgstr "目录" #: bookwyrm/templates/directory/directory.html:19 msgid "Make your profile discoverable to other BookWyrm users." -msgstr "" +msgstr "使你的个人资料可以被其它 BookWyrm 用户发现。" #: bookwyrm/templates/directory/directory.html:26 -#, fuzzy, python-format -#| msgid "You can set or change your reading goal any time from your profile page" +#, python-format msgid "You can opt-out at any time in your profile settings." -msgstr "你可以在任何时候从你的个人资料页面 中设置或改变你的阅读目标" +msgstr "你可以在任何时候从你的 个人资料设定 中退出。" #: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/snippets/goal_card.html:22 @@ -526,54 +514,46 @@ msgid "Dismiss message" msgstr "遣散消息" #: bookwyrm/templates/directory/directory.html:71 -#, fuzzy -#| msgid "followed you" msgid "follower you follow" msgid_plural "followers you follow" -msgstr[0] "关注了你" +msgstr[0] "你关注的关注者" #: bookwyrm/templates/directory/directory.html:78 -#, fuzzy -#| msgid "Your shelves" msgid "book on your shelves" msgid_plural "books on your shelves" -msgstr[0] "你的书架" +msgstr[0] "你书架上的书" #: bookwyrm/templates/directory/directory.html:86 msgid "posts" -msgstr "" +msgstr "发文" #: bookwyrm/templates/directory/directory.html:92 msgid "last active" -msgstr "" +msgstr "最后活跃" #: bookwyrm/templates/directory/sort_filter.html:5 msgid "Order by" -msgstr "" +msgstr "排列顺序" #: bookwyrm/templates/directory/sort_filter.html:8 -#, fuzzy -#| msgid "Suggest" msgid "Suggested" -msgstr "推荐" +msgstr "受推荐" #: bookwyrm/templates/directory/sort_filter.html:9 msgid "Recently active" -msgstr "" +msgstr "最近活跃" #: bookwyrm/templates/directory/user_type_filter.html:5 -#, fuzzy -#| msgid "User Activity" msgid "User type" -msgstr "用户活动" +msgstr "用户类型" #: bookwyrm/templates/directory/user_type_filter.html:8 msgid "BookWyrm users" -msgstr "" +msgstr "BookWyrm 用户" #: bookwyrm/templates/directory/user_type_filter.html:12 msgid "All known users" -msgstr "" +msgstr "所有已知用户" #: bookwyrm/templates/discover/about.html:7 #, python-format @@ -623,11 +603,11 @@ msgstr "本实例不开放。" #: bookwyrm/templates/discover/landing_layout.html:57 msgid "Thank you! Your request has been received." -msgstr "" +msgstr "谢谢你！我们已经受到了你的请求。" #: bookwyrm/templates/discover/landing_layout.html:60 msgid "Request an Invitation" -msgstr "" +msgstr "请求邀请" #: bookwyrm/templates/discover/landing_layout.html:64 #: bookwyrm/templates/password_reset_request.html:18 @@ -646,10 +626,8 @@ msgid "Your Account" msgstr "你的帐号" #: bookwyrm/templates/edit_author.html:5 -#, fuzzy -#| msgid "Edit Author" msgid "Edit Author:" -msgstr "编辑作者" +msgstr "编辑作者:" #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8 #: bookwyrm/templates/user/create_shelf_form.html:13 @@ -688,51 +666,46 @@ msgstr "Goodreads key:" #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," -msgstr "" +msgstr "你好呀，" #: bookwyrm/templates/email/html_layout.html:21 #, python-format msgid "BookWyrm hosted on %(site_name)s" -msgstr "" +msgstr "位于 %(site_name)s 的 BookWyrm" #: bookwyrm/templates/email/html_layout.html:23 msgid "Email preference" -msgstr "" +msgstr "邮箱偏好" #: bookwyrm/templates/email/invite/html_content.html:6 #: bookwyrm/templates/email/invite/subject.html:2 -#, fuzzy, python-format -#| msgid "About %(site_name)s" +#, python-format msgid "You're invited to join %(site_name)s!" -msgstr "关于 %(site_name)s" +msgstr "你受邀请加入 %(site_name)s！" #: bookwyrm/templates/email/invite/html_content.html:9 -#, fuzzy -#| msgid "Join" msgid "Join Now" -msgstr "加入" +msgstr "立即加入" #: bookwyrm/templates/email/invite/html_content.html:15 #, python-format msgid "Learn more about this instance." -msgstr "" +msgstr "了解更多 有关本实例的信息。" #: bookwyrm/templates/email/invite/text_content.html:4 #, python-format msgid "You're invited to join %(site_name)s! Click the link below to create an account." -msgstr "" +msgstr "你受邀请加入 %(site_name)s！点击下面的连接来创建帐号。" #: bookwyrm/templates/email/invite/text_content.html:8 -#, fuzzy -#| msgid "More about this site" msgid "Learn more about this instance:" -msgstr "关于本站点的更多" +msgstr "了解更多有关本实例的信息:" #: bookwyrm/templates/email/password_reset/html_content.html:6 #: bookwyrm/templates/email/password_reset/text_content.html:4 #, python-format msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account." -msgstr "" +msgstr "你请求重置你在 %(site_name)s 的密码。点击下面的链接来设置新密码并登录你的帐号。" #: bookwyrm/templates/email/password_reset/html_content.html:9 #: bookwyrm/templates/password_reset.html:4 @@ -745,13 +718,12 @@ msgstr "重设密码" #: bookwyrm/templates/email/password_reset/html_content.html:13 #: bookwyrm/templates/email/password_reset/text_content.html:8 msgid "If you didn't request to reset your password, you can ignore this email." -msgstr "" +msgstr "如果你没有请求重设密码，你可以忽略这封邮件。" #: bookwyrm/templates/email/password_reset/subject.html:2 -#, fuzzy, python-format -#| msgid "About %(site_name)s" +#, python-format msgid "Reset your %(site_name)s password" -msgstr "关于 %(site_name)s" +msgstr "重置你在 %(site_name)s 的密码" #: bookwyrm/templates/feed/direct_messages.html:8 #, python-format @@ -773,19 +745,15 @@ msgstr "你现在没有消息。" #: bookwyrm/templates/feed/feed.html:9 msgid "Home Timeline" -msgstr "" +msgstr "主页时间线" #: bookwyrm/templates/feed/feed.html:11 -#, fuzzy -#| msgid "%(tab_title)s Timeline" msgid "Local Timeline" -msgstr "%(tab_title)s 时间线" +msgstr "本地时间线" #: bookwyrm/templates/feed/feed.html:13 -#, fuzzy -#| msgid "Federated Servers" msgid "Federated Timeline" -msgstr "互联的服务器" +msgstr "跨站时间线" #: bookwyrm/templates/feed/feed.html:19 msgid "Home" @@ -802,7 +770,7 @@ msgstr "跨站" #: bookwyrm/templates/feed/feed.html:33 #, python-format msgid "load 0 unread status(es)" -msgstr "" +msgstr "加载 0 条未读状态" #: bookwyrm/templates/feed/feed.html:48 msgid "There aren't any activities right now! Try following a user to get started" @@ -811,7 +779,7 @@ msgstr "现在还没有任何活动！尝试着从关注一个用户开始吧" #: bookwyrm/templates/feed/feed.html:56 #: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" -msgstr "" +msgstr "可以关注的人" #: bookwyrm/templates/feed/feed_layout.html:5 msgid "Updates" @@ -853,25 +821,22 @@ msgstr "%(year)s 阅读目标" #, python-format msgid "%(mutuals)s follower you follow" msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "" +msgstr[0] "%(mutuals)s 个你也关注的关注者" #: bookwyrm/templates/feed/suggested_users.html:19 #, python-format msgid "%(shared_books)s book on your shelves" msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "" +msgstr[0] "%(shared_books)s 本在你书架上也有的书" #: bookwyrm/templates/get_started/book_preview.html:6 -#, fuzzy, python-format -#| msgid "Want to Read \"%(book_title)s\"" +#, python-format msgid "Have you read %(book_title)s?" -msgstr "想要阅读 \"%(book_title)s\"" +msgstr "你读过 %(book_title)s 了吗？" #: bookwyrm/templates/get_started/books.html:6 -#, fuzzy -#| msgid "Started reading" msgid "What are you reading?" -msgstr "已开始阅读" +msgstr "你在阅读什么？" #: bookwyrm/templates/get_started/books.html:9 #: bookwyrm/templates/lists/list.html:58 @@ -888,7 +853,7 @@ msgstr "没有找到 \"%(query)s\" 的书目" #: bookwyrm/templates/get_started/books.html:11 #, python-format msgid "You can add books when you start using %(site_name)s." -msgstr "" +msgstr "你可以在开始使用 %(site_name)s 后添加书目。" #: bookwyrm/templates/get_started/books.html:16 #: bookwyrm/templates/get_started/books.html:17 @@ -900,16 +865,13 @@ msgid "Search" msgstr "搜索" #: bookwyrm/templates/get_started/books.html:26 -#, fuzzy -#| msgid "Suggest Books" msgid "Suggested Books" -msgstr "推荐书目" +msgstr "推荐的书目" #: bookwyrm/templates/get_started/books.html:41 -#, fuzzy, python-format -#| msgid "About %(site_name)s" +#, python-format msgid "Popular on %(site_name)s" -msgstr "关于 %(site_name)s" +msgstr "%(site_name)s 上的热门" #: bookwyrm/templates/get_started/books.html:51 #: bookwyrm/templates/lists/list.html:75 @@ -919,46 +881,37 @@ msgstr "没有找到书目" #: bookwyrm/templates/get_started/books.html:54 #: bookwyrm/templates/get_started/profile.html:54 msgid "Save & continue" -msgstr "" +msgstr "保存 & 继续" #: bookwyrm/templates/get_started/layout.html:14 -#, fuzzy, python-format -#| msgid "About %(site_name)s" +#, python-format msgid "Welcome to %(site_name)s!" -msgstr "关于 %(site_name)s" +msgstr "欢迎来到 %(site_name)s！" #: bookwyrm/templates/get_started/layout.html:16 msgid "These are some first steps to get you started." -msgstr "" +msgstr "这些最初的步骤可以帮助你入门。" #: bookwyrm/templates/get_started/layout.html:30 #: bookwyrm/templates/get_started/profile.html:6 -#, fuzzy -#| msgid "View user profile" msgid "Create your profile" -msgstr "查看用户个人资料" +msgstr "创建你的个人资料" #: bookwyrm/templates/get_started/layout.html:34 -#, fuzzy -#| msgid "Add Books" msgid "Add books" msgstr "添加书目" #: bookwyrm/templates/get_started/layout.html:38 -#, fuzzy -#| msgid "Friendly" msgid "Find friends" -msgstr "友好" +msgstr "寻找同好" #: bookwyrm/templates/get_started/layout.html:44 msgid "Skip this step" -msgstr "" +msgstr "跳过此步骤" #: bookwyrm/templates/get_started/layout.html:48 -#, fuzzy -#| msgid "Finished" msgid "Finish" -msgstr "已完成" +msgstr "完成" #: bookwyrm/templates/get_started/profile.html:15 #: bookwyrm/templates/preferences/edit_user.html:24 @@ -972,7 +925,7 @@ msgstr "概要:" #: bookwyrm/templates/get_started/profile.html:23 msgid "A little bit about you" -msgstr "" +msgstr "少许关于你的信息" #: bookwyrm/templates/get_started/profile.html:32 #: bookwyrm/templates/preferences/edit_user.html:17 @@ -987,17 +940,15 @@ msgstr "手动批准关注者:" #: bookwyrm/templates/get_started/profile.html:48 #: bookwyrm/templates/preferences/edit_user.html:58 msgid "Show this account in suggested users:" -msgstr "" +msgstr "在推荐的用户中显示此帐号:" #: bookwyrm/templates/get_started/profile.html:52 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." -msgstr "" +msgstr "你的帐号会显示在目录中，并且可能会受其它 BookWyrm 用户推荐。" #: bookwyrm/templates/get_started/users.html:11 -#, fuzzy -#| msgid "Search for a book or user" msgid "Search for a user" -msgstr "搜索书目或用户" +msgstr "搜索用户" #: bookwyrm/templates/get_started/users.html:13 #: bookwyrm/templates/search_results.html:76 @@ -1036,19 +987,17 @@ msgid "%(username)s's %(year)s Books" msgstr "%(username)s 在 %(year)s 的书目" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/layout.html:102 +#: bookwyrm/templates/layout.html:97 msgid "Import Books" msgstr "导入书目" #: bookwyrm/templates/import.html:16 -#, fuzzy -#| msgid "Data source" msgid "Data source:" -msgstr "数据来源" +msgstr "数据来源:" #: bookwyrm/templates/import.html:29 msgid "Data file:" -msgstr "" +msgstr "数据文件:" #: bookwyrm/templates/import.html:37 msgid "Include reviews" @@ -1177,16 +1126,11 @@ msgstr "主导航菜单" msgid "Feed" msgstr "动态" -#: bookwyrm/templates/layout.html:92 -#: bookwyrm/templates/preferences/preferences_layout.html:14 -msgid "Profile" -msgstr "个人资料" - -#: bookwyrm/templates/layout.html:107 +#: bookwyrm/templates/layout.html:102 msgid "Settings" msgstr "设置" -#: bookwyrm/templates/layout.html:116 +#: bookwyrm/templates/layout.html:111 #: bookwyrm/templates/settings/admin_layout.html:24 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1194,57 +1138,57 @@ msgstr "设置" msgid "Invites" msgstr "邀请" -#: bookwyrm/templates/layout.html:123 +#: bookwyrm/templates/layout.html:118 msgid "Admin" msgstr "管理员" -#: bookwyrm/templates/layout.html:130 +#: bookwyrm/templates/layout.html:125 msgid "Log out" msgstr "登出" -#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139 +#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:10 msgid "Notifications" msgstr "通知" -#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160 +#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 #: bookwyrm/templates/login.html:17 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "用户名:" -#: bookwyrm/templates/layout.html:161 +#: bookwyrm/templates/layout.html:156 msgid "password" msgstr "密码" -#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 msgid "Forgot your password?" msgstr "忘记了密码？" -#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 #: bookwyrm/templates/login.html:33 msgid "Log in" msgstr "登录" -#: bookwyrm/templates/layout.html:173 +#: bookwyrm/templates/layout.html:168 msgid "Join" msgstr "加入" -#: bookwyrm/templates/layout.html:196 +#: bookwyrm/templates/layout.html:191 msgid "About this server" msgstr "关于本服务器" -#: bookwyrm/templates/layout.html:200 +#: bookwyrm/templates/layout.html:195 msgid "Contact site admin" msgstr "联系站点管理员" -#: bookwyrm/templates/layout.html:207 +#: bookwyrm/templates/layout.html:202 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "在 %(support_title)s 上支持 %(site_name)s" -#: bookwyrm/templates/layout.html:211 +#: bookwyrm/templates/layout.html:206 msgid "BookWyrm is open source software. You can contribute or report issues on GitHub." msgstr "BookWyrm 是开源软件。你可以在 GitHub 贡献或报告问题。" @@ -1331,7 +1275,7 @@ msgid "Added by %(username)s" msgstr "由 %(username)s 添加" #: bookwyrm/templates/lists/list.html:41 -#: bookwyrm/templates/snippets/shelf_selector.html:28 +#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "移除" @@ -1464,10 +1408,9 @@ msgid "Resolve" msgstr "已解决" #: bookwyrm/templates/moderation/reports.html:6 -#, fuzzy, python-format -#| msgid "Report @%(username)s" +#, python-format msgid "Reports: %(server_name)s" -msgstr "报告 %(username)s" +msgstr "报告: %(server_name)s" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:16 @@ -1476,20 +1419,17 @@ msgid "Reports" msgstr "报告" #: bookwyrm/templates/moderation/reports.html:13 -#, fuzzy, python-format -#| msgid "Report @%(username)s" +#, python-format msgid "Reports: %(server_name)s" -msgstr "报告 %(username)s" +msgstr "报告: %(server_name)s" #: bookwyrm/templates/moderation/reports.html:27 msgid "Resolved" msgstr "已解决" #: bookwyrm/templates/moderation/reports.html:34 -#, fuzzy -#| msgid "No books found" msgid "No reports found." -msgstr "没有找到书目" +msgstr "没有找到报告" #: bookwyrm/templates/notifications.html:14 msgid "Delete notifications" @@ -1653,16 +1593,20 @@ msgstr "在消息流中显示设置阅读目标的提示:" #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." -msgstr "" +msgstr "你的帐号会显示在 目录 中，并可能受其它 BookWyrm 用户推荐。" #: bookwyrm/templates/preferences/edit_user.html:65 msgid "Preferred Timezone: " -msgstr "" +msgstr "偏好的时区:" #: bookwyrm/templates/preferences/preferences_layout.html:11 msgid "Account" msgstr "帐号" +#: bookwyrm/templates/preferences/preferences_layout.html:14 +msgid "Profile" +msgstr "个人资料" + #: bookwyrm/templates/preferences/preferences_layout.html:20 msgid "Relationships" msgstr "关系" @@ -1700,7 +1644,7 @@ msgstr "管理用户" #: bookwyrm/templates/settings/user_admin.html:3 #: bookwyrm/templates/settings/user_admin.html:10 msgid "Users" -msgstr "" +msgstr "用户" #: bookwyrm/templates/settings/admin_layout.html:32 #: bookwyrm/templates/settings/federation.html:3 @@ -1739,32 +1683,24 @@ msgid "Registration" msgstr "注册" #: bookwyrm/templates/settings/federated_server.html:7 -#, fuzzy -#| msgid "Back to reports" msgid "Back to server list" -msgstr "回到报告" +msgstr "回到服务器列表" #: bookwyrm/templates/settings/federated_server.html:12 msgid "Details" -msgstr "" +msgstr "详细" #: bookwyrm/templates/settings/federated_server.html:15 -#, fuzzy -#| msgid "Software" msgid "Software:" -msgstr "软件" +msgstr "软件:" #: bookwyrm/templates/settings/federated_server.html:19 -#, fuzzy -#| msgid "Description:" msgid "Version:" -msgstr "描述:" +msgstr "版本:" #: bookwyrm/templates/settings/federated_server.html:23 -#, fuzzy -#| msgid "Status" msgid "Status:" -msgstr "状态" +msgstr "状态:" #: bookwyrm/templates/settings/federated_server.html:30 #: bookwyrm/templates/user/user_layout.html:50 @@ -1772,56 +1708,45 @@ msgid "Activity" msgstr "活动" #: bookwyrm/templates/settings/federated_server.html:33 -#, fuzzy -#| msgid "Username:" msgid "Users:" -msgstr "用户名:" +msgstr "用户:" #: bookwyrm/templates/settings/federated_server.html:36 #: bookwyrm/templates/settings/federated_server.html:43 msgid "View all" -msgstr "" +msgstr "查看全部" #: bookwyrm/templates/settings/federated_server.html:40 -#, fuzzy -#| msgid "Reports" msgid "Reports:" -msgstr "报告" +msgstr "报告:" #: bookwyrm/templates/settings/federated_server.html:47 -#, fuzzy -#| msgid "followed you" msgid "Followed by us:" -msgstr "关注了你" +msgstr "我们关注了的:" #: bookwyrm/templates/settings/federated_server.html:53 -#, fuzzy -#| msgid "followed you" msgid "Followed by them:" -msgstr "关注了你" +msgstr "TA 们关注了的:" #: bookwyrm/templates/settings/federated_server.html:59 -#, fuzzy -#| msgid "Blocked Users" msgid "Blocked by us:" -msgstr "屏蔽的用户" +msgstr "我们所屏蔽的:" #: bookwyrm/templates/settings/federation.html:13 msgid "Server name" msgstr "服务器名称" #: bookwyrm/templates/settings/federation.html:17 -#, fuzzy -#| msgid "Federated" msgid "Date federated" -msgstr "跨站" +msgstr "跨站日期" #: bookwyrm/templates/settings/federation.html:21 msgid "Software" msgstr "软件" #: bookwyrm/templates/settings/federation.html:24 -#: bookwyrm/templates/settings/manage_invite_requests.html:33 +#: bookwyrm/templates/settings/manage_invite_requests.html:40 +#: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/settings/user_admin.html:32 msgid "Status" msgstr "状态" @@ -1830,74 +1755,67 @@ msgstr "状态" #: bookwyrm/templates/settings/manage_invite_requests.html:11 #: bookwyrm/templates/settings/manage_invite_requests.html:25 #: bookwyrm/templates/settings/manage_invites.html:11 -#, fuzzy -#| msgid "Invites" msgid "Invite Requests" -msgstr "邀请" +msgstr "邀请请求" #: bookwyrm/templates/settings/manage_invite_requests.html:23 msgid "Ignored Invite Requests" -msgstr "" +msgstr "已忽略的邀请请求" -#: bookwyrm/templates/settings/manage_invite_requests.html:31 +#: bookwyrm/templates/settings/manage_invite_requests.html:35 msgid "Date" -msgstr "" +msgstr "日期" -#: bookwyrm/templates/settings/manage_invite_requests.html:32 +#: bookwyrm/templates/settings/manage_invite_requests.html:38 msgid "Email" -msgstr "" +msgstr "邮箱" -#: bookwyrm/templates/settings/manage_invite_requests.html:34 -#, fuzzy -#| msgid "Actions" +#: bookwyrm/templates/settings/manage_invite_requests.html:43 msgid "Action" msgstr "动作" -#: bookwyrm/templates/settings/manage_invite_requests.html:37 -#, fuzzy -#| msgid "Follow Requests" +#: bookwyrm/templates/settings/manage_invite_requests.html:46 msgid "No requests" -msgstr "关注请求" +msgstr "没有请求" -#: bookwyrm/templates/settings/manage_invite_requests.html:45 -#, fuzzy -#| msgid "Accept" +#: bookwyrm/templates/settings/manage_invite_requests.html:54 +#: bookwyrm/templates/settings/status_filter.html:16 msgid "Accepted" -msgstr "接受" +msgstr "已接受" -#: bookwyrm/templates/settings/manage_invite_requests.html:47 +#: bookwyrm/templates/settings/manage_invite_requests.html:56 +#: bookwyrm/templates/settings/status_filter.html:12 msgid "Sent" -msgstr "" +msgstr "已发送" -#: bookwyrm/templates/settings/manage_invite_requests.html:49 +#: bookwyrm/templates/settings/manage_invite_requests.html:58 +#: bookwyrm/templates/settings/status_filter.html:8 msgid "Requested" -msgstr "" +msgstr "已请求" -#: bookwyrm/templates/settings/manage_invite_requests.html:57 +#: bookwyrm/templates/settings/manage_invite_requests.html:68 msgid "Send invite" -msgstr "" - -#: bookwyrm/templates/settings/manage_invite_requests.html:59 -msgid "Re-send invite" -msgstr "" +msgstr "发送请求" #: bookwyrm/templates/settings/manage_invite_requests.html:70 +msgid "Re-send invite" +msgstr "重新发送请求" + +#: bookwyrm/templates/settings/manage_invite_requests.html:90 msgid "Ignore" -msgstr "" +msgstr "忽略" -#: bookwyrm/templates/settings/manage_invite_requests.html:72 -msgid "Un-gnore" -msgstr "" +#: bookwyrm/templates/settings/manage_invite_requests.html:92 +msgid "Un-ignore" +msgstr "取消忽略" -#: bookwyrm/templates/settings/manage_invite_requests.html:83 -#, fuzzy -#| msgid "Back to reports" +#: bookwyrm/templates/settings/manage_invite_requests.html:103 msgid "Back to pending requests" -msgstr "回到报告" +msgstr "回到待处理的请求" -#: bookwyrm/templates/settings/manage_invite_requests.html:85 +#: bookwyrm/templates/settings/manage_invite_requests.html:105 msgid "View ignored requests" -msgstr "" +msgstr "查看忽略的请求" #: bookwyrm/templates/settings/manage_invites.html:21 msgid "Generate New Invite" @@ -1984,10 +1902,8 @@ msgid "Allow registration:" msgstr "允许注册:" #: bookwyrm/templates/settings/site.html:83 -#, fuzzy -#| msgid "Follow Requests" msgid "Allow invite requests:" -msgstr "关注请求" +msgstr "允许请求邀请:" #: bookwyrm/templates/settings/site.html:87 msgid "Registration closed text:" @@ -1996,43 +1912,35 @@ msgstr "注册关闭文字:" #: bookwyrm/templates/settings/user_admin.html:7 #, python-format msgid "Users: %(server_name)s" -msgstr "" +msgstr "用户: %(server_name)s" #: bookwyrm/templates/settings/user_admin.html:20 -#, fuzzy -#| msgid "Username:" msgid "Username" -msgstr "用户名:" +msgstr "用户名" #: bookwyrm/templates/settings/user_admin.html:24 -#, fuzzy -#| msgid "Added:" msgid "Date Added" -msgstr "添加了:" +msgstr "添加日期:" #: bookwyrm/templates/settings/user_admin.html:28 msgid "Last Active" -msgstr "" +msgstr "最后或缺" #: bookwyrm/templates/settings/user_admin.html:36 -#, fuzzy -#| msgid "Remove" msgid "Remote server" -msgstr "移除" +msgstr "移除服务器" #: bookwyrm/templates/settings/user_admin.html:45 -#, fuzzy -#| msgid "Activity" msgid "Active" -msgstr "活动" +msgstr "活跃" #: bookwyrm/templates/settings/user_admin.html:45 msgid "Inactive" -msgstr "" +msgstr "停用" #: bookwyrm/templates/settings/user_admin.html:50 msgid "Not set" -msgstr "" +msgstr "未设置" #: bookwyrm/templates/snippets/block_button.html:5 msgid "Block" @@ -2076,22 +1984,16 @@ msgid "Quote" msgstr "引用" #: bookwyrm/templates/snippets/create_status_form.html:18 -#, fuzzy -#| msgid "Comment" msgid "Comment:" -msgstr "评论" +msgstr "评论:" #: bookwyrm/templates/snippets/create_status_form.html:20 -#, fuzzy -#| msgid "Quote" msgid "Quote:" -msgstr "引用" +msgstr "引用:" #: bookwyrm/templates/snippets/create_status_form.html:22 -#, fuzzy -#| msgid "Review" msgid "Review:" -msgstr "书评" +msgstr "书评:" #: bookwyrm/templates/snippets/create_status_form.html:29 #: bookwyrm/templates/user/shelf.html:81 @@ -2169,24 +2071,20 @@ msgid "Un-like status" msgstr "取消喜欢状态" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7 -#, fuzzy -#| msgid "Show less" msgid "Show filters" -msgstr "显示更少" +msgstr "显示过滤器" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9 msgid "Hide filters" -msgstr "" +msgstr "隐藏过滤器" -#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19 +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22 msgid "Apply filters" -msgstr "" +msgstr "应用过滤器" -#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23 -#, fuzzy -#| msgid "Clear search" +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26 msgid "Clear filters" -msgstr "清除搜索" +msgstr "清除过滤器" #: bookwyrm/templates/snippets/follow_button.html:12 msgid "Follow" @@ -2211,23 +2109,21 @@ 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: %(rating)s star" -#| msgid_plural "Rated %(title)s: %(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 打了分: %(rating)s 星" +msgstr[0] "为 %(title)s 打了分: %(display_rating)s 星" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, 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] "" +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 "" +msgstr "\"%(book_title)s\" 的书评: %(review_title)s" #: bookwyrm/templates/snippets/goal_card.html:23 #, python-format @@ -2276,11 +2172,21 @@ msgstr "你已经阅读了 %(goal_count)s 本书中的 %(re msgid "%(username)s has read %(read_count)s of %(goal_count)s books." msgstr "%(username)s 已经阅读了 %(goal_count)s 本书中的 %(read_count)s 本。" -#: bookwyrm/templates/snippets/pagination.html:7 +#: bookwyrm/templates/snippets/page_text.html:4 +#, python-format +msgid "page %(page)s of %(total_pages)s" +msgstr "%(total_pages)s 页中的第 %(page)s 页" + +#: bookwyrm/templates/snippets/page_text.html:6 +#, python-format +msgid "page %(page)s" +msgstr "第 %(page)s 页" + +#: bookwyrm/templates/snippets/pagination.html:5 msgid "Previous" msgstr "往前" -#: bookwyrm/templates/snippets/pagination.html:15 +#: bookwyrm/templates/snippets/pagination.html:9 msgid "Next" msgstr "往后" @@ -2321,28 +2227,28 @@ msgstr "评价" msgid "Progress Updates:" msgstr "进度更新:" -#: bookwyrm/templates/snippets/readthrough.html:12 +#: bookwyrm/templates/snippets/readthrough.html:14 msgid "finished" msgstr "已完成" -#: bookwyrm/templates/snippets/readthrough.html:15 +#: bookwyrm/templates/snippets/readthrough.html:25 msgid "Show all updates" msgstr "显示所有更新" -#: bookwyrm/templates/snippets/readthrough.html:31 +#: bookwyrm/templates/snippets/readthrough.html:41 msgid "Delete this progress update" msgstr "删除此进度更新" -#: bookwyrm/templates/snippets/readthrough.html:41 +#: bookwyrm/templates/snippets/readthrough.html:51 msgid "started" msgstr "已开始" -#: bookwyrm/templates/snippets/readthrough.html:47 -#: bookwyrm/templates/snippets/readthrough.html:61 +#: bookwyrm/templates/snippets/readthrough.html:57 +#: bookwyrm/templates/snippets/readthrough.html:71 msgid "Edit read dates" msgstr "编辑阅读日期" -#: bookwyrm/templates/snippets/readthrough.html:51 +#: bookwyrm/templates/snippets/readthrough.html:61 msgid "Delete these read dates" msgstr "删除这些阅读日期" @@ -2403,10 +2309,8 @@ msgid "Import book" msgstr "导入书目" #: bookwyrm/templates/snippets/shelf_selector.html:4 -#, fuzzy -#| msgid "Your books" msgid "Move book" -msgstr "你的书目" +msgstr "移动书目" #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 #, python-format @@ -2415,10 +2319,8 @@ msgstr "完成 \"%(book_title)s\"" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35 -#, fuzzy -#| msgid "Updates" msgid "Update progress" -msgstr "更新" +msgstr "更新进度" #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" @@ -2438,10 +2340,9 @@ msgid "Want to read" msgstr "想要阅读" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48 -#, fuzzy, python-format -#| msgid "Report @%(username)s" +#, python-format msgid "Remove from %(name)s" -msgstr "报告 %(username)s" +msgstr "从 %(name)s 移除" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 #, python-format @@ -2512,16 +2413,12 @@ msgid "Switch to this edition" msgstr "切换到此版本" #: bookwyrm/templates/snippets/table-sort-header.html:6 -#, fuzzy -#| msgid "Started reading" msgid "Sorted asccending" -msgstr "已开始阅读" +msgstr "升序排序" #: bookwyrm/templates/snippets/table-sort-header.html:10 -#, fuzzy -#| msgid "Started reading" msgid "Sorted descending" -msgstr "已开始阅读" +msgstr "降序排序" #: bookwyrm/templates/snippets/tag.html:14 msgid "Remove tag" @@ -2537,10 +2434,9 @@ msgid "Books tagged \"%(tag.name)s\"" msgstr "标有 \"%(tag.name)s\" 标签的书" #: bookwyrm/templates/user/books_header.html:5 -#, fuzzy, python-format -#| msgid "%(username)s's %(year)s Books" +#, python-format msgid "%(username)s's books" -msgstr "%(username)s 在 %(year)s 的书目" +msgstr "%(username)s 的书目" #: bookwyrm/templates/user/create_shelf_form.html:5 #: bookwyrm/templates/user/create_shelf_form.html:22 @@ -2589,10 +2485,8 @@ msgid "Create list" msgstr "创建列表" #: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56 -#, fuzzy -#| msgid "books" msgid "All books" -msgstr "书目" +msgstr "所有书目" #: bookwyrm/templates/user/shelf.html:37 msgid "Create shelf" @@ -2614,11 +2508,11 @@ msgstr "已开始" msgid "Finished" msgstr "已完成" -#: bookwyrm/templates/user/shelf.html:127 +#: bookwyrm/templates/user/shelf.html:129 msgid "This shelf is empty." msgstr "此书架是空的。" -#: bookwyrm/templates/user/shelf.html:133 +#: bookwyrm/templates/user/shelf.html:135 msgid "Delete shelf" msgstr "删除书架" @@ -2627,14 +2521,13 @@ msgid "Edit profile" msgstr "编辑个人资料" #: bookwyrm/templates/user/user.html:34 -#, fuzzy, python-format -#| msgid "See all %(size)s" +#, python-format msgid "View all %(size)s" msgstr "查看所有 %(size)s 本" #: bookwyrm/templates/user/user.html:47 msgid "View all books" -msgstr "" +msgstr "查看所有书目" #: bookwyrm/templates/user/user.html:59 #, python-format @@ -2662,8 +2555,6 @@ msgid "Reading Goal" msgstr "阅读目标" #: bookwyrm/templates/user/user_layout.html:68 -#, fuzzy -#| msgid "Book" msgid "Books" msgstr "书目" @@ -2684,22 +2575,20 @@ msgid "%(counter)s following" msgstr "关注着 %(counter)s 人" #: bookwyrm/views/password.py:32 -#, fuzzy -#| msgid "A user with that username already exists." msgid "No user with that email address was found." -msgstr "已经存在使用该用户名的用户。" +msgstr "没有找到使用该邮箱的用户。" #: bookwyrm/views/password.py:41 #, python-format msgid "A password reset link sent to %s" -msgstr "" +msgstr "密码重置连接已发送给 %s" #, fuzzy #~| msgid "Started" #~ msgid "Getting Started" #~ msgstr "已开始" -#, fuzzy, python-format +#, fuzzy #~| msgid "No users found for \"%(query)s\"" #~ msgid "No users were found for \"%(query)s\"" #~ msgstr "没有找到 \"%(query)s\" 的用户" @@ -2713,7 +2602,6 @@ msgstr "" #~ msgid "Your lists" #~ msgstr "你的列表" -#, python-format #~ msgid "See all %(size)s lists" #~ msgstr "查看所有 %(size)s 个列表" @@ -2738,14 +2626,12 @@ msgstr "" #~ msgid "Your Shelves" #~ msgstr "你的书架" -#, python-format #~ msgid "%(username)s: Shelves" #~ msgstr "%(username)s: 书架" #~ msgid "Shelves" #~ msgstr "书架" -#, python-format #~ msgid "See all %(shelf_count)s shelves" #~ msgstr "查看所有 %(shelf_count)s 个书架" From 1e4cc68faec0d448e4fe492e71bd3a0ab1b8ea64 Mon Sep 17 00:00:00 2001 From: GuDzpoz Date: Sun, 4 Apr 2021 12:37:40 +0800 Subject: [PATCH 4/6] Contextual fixes --- locale/zh_CN/LC_MESSAGES/django.mo | Bin 38410 -> 38419 bytes locale/zh_CN/LC_MESSAGES/django.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index bdfaaef855d82416fa6673b122350d5b1cdde240..912802b7dc0d8837bad0ed86853da5e3b397ef84 100644 GIT binary patch delta 3111 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 Date: Sun, 4 Apr 2021 12:41:12 +0800 Subject: [PATCH 5/6] Contextual fixes --- locale/zh_CN/LC_MESSAGES/django.mo | Bin 38419 -> 38419 bytes locale/zh_CN/LC_MESSAGES/django.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index 912802b7dc0d8837bad0ed86853da5e3b397ef84..019000e2a74794ac764fb9313da0e56c4fa59479 100644 GIT binary patch delta 21 dcmbQdhH3H|rVZx(Y|rMbd9riaX50R2Yyfg(3d;Zh delta 21 dcmbQdhH3H|rVZx(Y)^JBdp>*JX50R2Yyfhw3e5lj diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 30f1039a0..85187207b 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -2136,7 +2136,7 @@ msgstr "阅读目标:" #: bookwyrm/templates/snippets/goal_form.html:14 msgid "books" -msgstr "书目" +msgstr "本书" #: bookwyrm/templates/snippets/goal_form.html:19 msgid "Goal privacy:" From 485b0fa0f316de04a23ec3a749272dca02bc41b9 Mon Sep 17 00:00:00 2001 From: Fabien Basmaison Date: Sun, 4 Apr 2021 15:08:42 +0200 Subject: [PATCH 6/6] Simplify rating form: - Create a snippet to regroup similar code. - Reduce and document tricky logic of CSS. - Add i18n strings. --- bookwyrm/static/css/format.css | 50 ++---- .../snippets/create_status_form.html | 12 +- .../templates/snippets/form_rate_stars.html | 54 ++++++ bookwyrm/templates/snippets/rate_action.html | 12 +- bookwyrm/templates/snippets/stars.html | 25 ++- locale/fr_FR/LC_MESSAGES/django.mo | Bin 24275 -> 24395 bytes locale/fr_FR/LC_MESSAGES/django.po | 168 ++++++++++-------- 7 files changed, 189 insertions(+), 132 deletions(-) create mode 100644 bookwyrm/templates/snippets/form_rate_stars.html diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css index e3ae1ce79..ccd7277de 100644 --- a/bookwyrm/static/css/format.css +++ b/bookwyrm/static/css/format.css @@ -80,52 +80,34 @@ html { } } -/* --- STARS --- */ -.rate-stars button.icon { - background: none; - border: none; - padding: 0; - margin: 0; - display: inline; +/** Stars in a review form + * + * Specificity makes hovering taking over checked inputs. + * + * \e9d9: filled star + * \e9d7: empty star; + ******************************************************************************/ + +.form-rate-stars { + width: max-content; } -.rate-stars:hover .icon::before { +/* All stars are visually filled by default. */ +.form-rate-stars .icon::before { content: '\e9d9'; } -.rate-stars form:hover ~ form .icon::before { +/* Icons directly following inputs that follow the checked input are emptied. */ +.form-rate-stars input:checked ~ input + .icon::before { content: '\e9d7'; } -/** stars in a review form - * - * @todo Simplify the logic for those icons. - */ -.form-rate-stars input + .icon.icon::before { - content: '\e9d9'; -} - +/* When a label is hovered, repeat the fill-all-then-empty-following pattern. */ .form-rate-stars:hover .icon.icon::before { content: '\e9d9'; } -.form-rate-stars input:checked + .icon.icon::before { - content: '\e9d9'; -} - -.form-rate-stars input:checked + * ~ .icon.icon::before { - content: '\e9d7'; -} - -.form-rate-stars:hover label.icon.icon::before { - content: '\e9d9'; -} - -.form-rate-stars label.icon:hover::before { - content: '\e9d9'; -} - -.form-rate-stars label.icon:hover ~ label.icon.icon::before { +.form-rate-stars .icon:hover ~ .icon::before { content: '\e9d7'; } diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html index c70a0e58b..091a2c6b7 100644 --- a/bookwyrm/templates/snippets/create_status_form.html +++ b/bookwyrm/templates/snippets/create_status_form.html @@ -27,16 +27,8 @@ {% if type == 'review' %}
{% trans "Rating" %} -
- - - {% for i in '12345'|make_list %} - - - {% endfor %} -
+ + {% include 'snippets/form_rate_stars.html' with book=book type=type|default:'summary' %}
{% endif %} diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html new file mode 100644 index 000000000..25544739e --- /dev/null +++ b/bookwyrm/templates/snippets/form_rate_stars.html @@ -0,0 +1,54 @@ +{% spaceless %} +{% load i18n %} +{% load bookwyrm_tags %} + +
+ + + + + {% for i in '12345'|make_list %} + + + + {% endfor %} +
+{% endspaceless %} diff --git a/bookwyrm/templates/snippets/rate_action.html b/bookwyrm/templates/snippets/rate_action.html index 447a1c9ba..47662147f 100644 --- a/bookwyrm/templates/snippets/rate_action.html +++ b/bookwyrm/templates/snippets/rate_action.html @@ -8,18 +8,8 @@ - -
- - - {% for i in '12345'|make_list %} - - - {% endfor %} -
+ {% include 'snippets/form_rate_stars.html' with book=book classes='mb-1 has-text-warning-dark' %}