From 5d88282f4e6533ab953c9c7e120179ae5227d6cc Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 29 May 2024 10:50:41 -0400 Subject: [PATCH] run lint on 3.12 --- catalog/common/mixins.py | 23 -- catalog/migrations/0001_initial.py | 3 +- catalog/models.py | 11 +- locale/zh_Hans/LC_MESSAGES/django.po | 418 ++++++++++++++------------- pyproject.toml | 11 - 5 files changed, 229 insertions(+), 237 deletions(-) delete mode 100644 catalog/common/mixins.py diff --git a/catalog/common/mixins.py b/catalog/common/mixins.py deleted file mode 100644 index fa722f70..00000000 --- a/catalog/common/mixins.py +++ /dev/null @@ -1,23 +0,0 @@ -class SoftDeleteMixin: - """ - SoftDeleteMixin - - Model must add this: - is_deleted = models.BooleanField(default=False, db_index=True) - - Model may override this: - def clear(self): - pass - """ - - def clear(self): - pass - - def delete(self, using=None, keep_parents=False, soft=True, *args, **kwargs): - if soft: - self.clear() - self.is_deleted = True - self.save(using=using) # type: ignore - return 0, {} - else: - return super().delete(using=using, keep_parents=keep_parents, *args, **kwargs) # type: ignore diff --git a/catalog/migrations/0001_initial.py b/catalog/migrations/0001_initial.py index 738d2667..10e78913 100644 --- a/catalog/migrations/0001_initial.py +++ b/catalog/migrations/0001_initial.py @@ -6,7 +6,6 @@ import django.db.models.deletion import simple_history.models from django.db import migrations, models -import catalog.common.mixins import catalog.common.utils @@ -213,7 +212,7 @@ class Migration(migrations.Migration): ("edited_time", models.DateTimeField(auto_now=True)), ("is_deleted", models.BooleanField(db_index=True, default=False)), ], - bases=(catalog.common.mixins.SoftDeleteMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name="Album", diff --git a/catalog/models.py b/catalog/models.py index d5025826..8ebca194 100644 --- a/catalog/models.py +++ b/catalog/models.py @@ -1,6 +1,5 @@ from auditlog.registry import auditlog from django.conf import settings -from django.contrib.contenttypes.models import ContentType from loguru import logger from .book.models import Edition, EditionInSchema, EditionSchema, Series, Work @@ -101,11 +100,6 @@ def init_catalog_audit_log(): __all__ = [ - "Edition", - "EditionInSchema", - "EditionSchema", - "Series", - "Work", "CatalogCollection", "AvailableItemCategory", "ExternalResource", @@ -118,6 +112,11 @@ __all__ = [ "SiteName", "item_categories", "item_content_types", + "Edition", + "EditionInSchema", + "EditionSchema", + "Series", + "Work", "Game", "GameInSchema", "GameSchema", diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 6ff08ab4..d43f3718 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-28 09:57-0400\n" +"POT-Creation-Date: 2024-05-29 13:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,391 +23,403 @@ msgstr "英语" msgid "Simplified Chinese" msgstr "简体中文" -#: catalog/book/models.py:93 +#: catalog/book/models.py:96 msgid "subtitle" msgstr "副标题" -#: catalog/book/models.py:96 catalog/movie/models.py:65 -#: catalog/performance/models.py:257 catalog/tv/models.py:127 -#: catalog/tv/models.py:289 +#: catalog/book/models.py:99 catalog/movie/models.py:65 +#: catalog/performance/models.py:260 catalog/tv/models.py:133 +#: catalog/tv/models.py:297 msgid "original title" msgstr "原名" -#: catalog/book/models.py:99 catalog/book/models.py:250 +#: catalog/book/models.py:102 catalog/book/models.py:253 msgid "author" msgstr "作者" -#: catalog/book/models.py:106 +#: catalog/book/models.py:109 msgid "translator" msgstr "译者" -#: catalog/book/models.py:113 catalog/movie/models.py:145 -#: catalog/performance/models.py:125 catalog/performance/models.py:267 -#: catalog/templates/edition.html:47 catalog/tv/models.py:207 -#: catalog/tv/models.py:369 users/models/user.py:102 +#: catalog/book/models.py:116 catalog/movie/models.py:145 +#: catalog/performance/models.py:128 catalog/performance/models.py:270 +#: catalog/templates/edition.html:47 catalog/tv/models.py:213 +#: catalog/tv/models.py:377 users/models/user.py:102 #: users/templates/users/preferences.html:133 msgid "language" msgstr "语言" -#: catalog/book/models.py:116 catalog/templates/edition.html:26 +#: catalog/book/models.py:119 catalog/templates/edition.html:26 msgid "publishing house" msgstr "出版社" -#: catalog/book/models.py:119 +#: catalog/book/models.py:122 msgid "publication year" msgstr "发行年份" -#: catalog/book/models.py:125 +#: catalog/book/models.py:128 msgid "publication month" msgstr "发行月份" -#: catalog/book/models.py:131 catalog/templates/edition.html:52 +#: catalog/book/models.py:134 catalog/templates/edition.html:52 msgid "binding" msgstr "装订" -#: catalog/book/models.py:133 +#: catalog/book/models.py:136 msgid "pages" msgstr "页数" -#: catalog/book/models.py:135 catalog/templates/edition.html:42 +#: catalog/book/models.py:138 catalog/templates/edition.html:42 msgid "series" msgstr "丛书" -#: catalog/book/models.py:137 +#: catalog/book/models.py:140 msgid "contents" msgstr "目录" -#: catalog/book/models.py:138 catalog/templates/edition.html:57 +#: catalog/book/models.py:141 catalog/templates/edition.html:57 msgid "price" msgstr "价格" -#: catalog/book/models.py:139 catalog/templates/edition.html:31 +#: catalog/book/models.py:142 catalog/templates/edition.html:31 msgid "imprint" msgstr "出品方" -#: catalog/book/models.py:257 catalog/game/models.py:58 +#: catalog/book/models.py:260 catalog/game/models.py:58 #: catalog/movie/models.py:68 catalog/music/models.py:85 -#: catalog/performance/models.py:111 catalog/performance/models.py:260 -#: catalog/tv/models.py:131 catalog/tv/models.py:292 +#: catalog/performance/models.py:114 catalog/performance/models.py:263 +#: catalog/tv/models.py:137 catalog/tv/models.py:300 msgid "other title" msgstr "其它标题" -#: catalog/common/models.py:30 +#: catalog/common/models.py:33 msgid "Unknown" msgstr "未知" -#: catalog/common/models.py:31 +#: catalog/common/models.py:34 msgid "Douban" msgstr "豆瓣" -#: catalog/common/models.py:32 catalog/common/models.py:65 +#: catalog/common/models.py:35 catalog/common/models.py:72 msgid "Goodreads" msgstr "Goodreads" -#: catalog/common/models.py:33 catalog/common/models.py:67 +#: catalog/common/models.py:36 catalog/common/models.py:76 msgid "Google Books" msgstr "谷歌图书" -#: catalog/common/models.py:34 +#: catalog/common/models.py:37 msgid "BooksTW" msgstr "博客來" -#: catalog/common/models.py:35 catalog/common/models.py:60 +#: catalog/common/models.py:38 catalog/common/models.py:65 #: catalog/templates/movie.html:51 catalog/templates/tvseason.html:68 #: catalog/templates/tvshow.html:63 msgid "IMDb" msgstr "IMDb" -#: catalog/common/models.py:36 +#: catalog/common/models.py:39 msgid "TMDB" msgstr "TMDB" -#: catalog/common/models.py:37 catalog/common/models.py:76 +#: catalog/common/models.py:40 catalog/common/models.py:89 msgid "Bandcamp" msgstr "Bandcamp" -#: catalog/common/models.py:38 +#: catalog/common/models.py:41 msgid "Spotify" msgstr "Spotify" -#: catalog/common/models.py:39 +#: catalog/common/models.py:42 msgid "IGDB" msgstr "IGDB" -#: catalog/common/models.py:40 +#: catalog/common/models.py:43 msgid "Steam" msgstr "Steam" -#: catalog/common/models.py:41 catalog/common/models.py:90 +#: catalog/common/models.py:44 catalog/common/models.py:107 msgid "Bangumi" msgstr "Bangumi" -#: catalog/common/models.py:42 +#: catalog/common/models.py:45 msgid "BGG" msgstr "BGG" -#: catalog/common/models.py:44 +#: catalog/common/models.py:47 msgid "RSS" msgstr "RSS" -#: catalog/common/models.py:45 +#: catalog/common/models.py:48 msgid "Discogs" msgstr "Discogs" -#: catalog/common/models.py:46 catalog/common/models.py:92 +#: catalog/common/models.py:49 catalog/common/models.py:109 msgid "Apple Music" msgstr "苹果音乐" -#: catalog/common/models.py:47 catalog/common/models.py:93 +#: catalog/common/models.py:50 catalog/common/models.py:110 msgid "Fediverse" msgstr "联邦宇宙" -#: catalog/common/models.py:51 +#: catalog/common/models.py:54 msgid "WikiData" msgstr "维基数据" -#: catalog/common/models.py:52 +#: catalog/common/models.py:55 msgid "ISBN10" msgstr "ISBN10" -#: catalog/common/models.py:53 catalog/templates/edition.html:19 +#: catalog/common/models.py:56 catalog/templates/edition.html:19 msgid "ISBN" msgstr "ISBN" -#: catalog/common/models.py:54 +#: catalog/common/models.py:57 msgid "ASIN" msgstr "ASIN" -#: catalog/common/models.py:55 +#: catalog/common/models.py:58 msgid "ISSN" msgstr "ISSN" -#: catalog/common/models.py:56 +#: catalog/common/models.py:59 msgid "CUBN" msgstr "统一书号" -#: catalog/common/models.py:57 +#: catalog/common/models.py:60 msgid "ISRC" msgstr "ISRC" -#: catalog/common/models.py:58 +#: catalog/common/models.py:62 msgid "GTIN UPC EAN" msgstr "条形码" -#: catalog/common/models.py:59 +#: catalog/common/models.py:64 msgid "RSS Feed URL" msgstr "RSS网址" -#: catalog/common/models.py:61 +#: catalog/common/models.py:66 msgid "TMDB TV Serie" msgstr "TMDB电视剧集" -#: catalog/common/models.py:62 +#: catalog/common/models.py:67 msgid "TMDB TV Season" msgstr "TMDB电视分季" -#: catalog/common/models.py:63 +#: catalog/common/models.py:69 msgid "TMDB TV Episode" msgstr "TMDB电视单集" -#: catalog/common/models.py:64 +#: catalog/common/models.py:71 msgid "TMDB Movie" msgstr "TMDB电影" -#: catalog/common/models.py:66 +#: catalog/common/models.py:74 msgid "Goodreads Work" msgstr "Goodreads著作" -#: catalog/common/models.py:68 +#: catalog/common/models.py:77 msgid "Douban Book" msgstr "豆瓣图书" -#: catalog/common/models.py:69 +#: catalog/common/models.py:79 msgid "Douban Book Work" msgstr "豆瓣图书著作" -#: catalog/common/models.py:70 +#: catalog/common/models.py:81 msgid "Douban Movie" msgstr "豆瓣电影" -#: catalog/common/models.py:71 +#: catalog/common/models.py:82 msgid "Douban Music" msgstr "豆瓣音乐" -#: catalog/common/models.py:72 +#: catalog/common/models.py:83 msgid "Douban Game" msgstr "豆瓣游戏" -#: catalog/common/models.py:73 +#: catalog/common/models.py:84 msgid "Douban Drama" msgstr "豆瓣舞台剧" -#: catalog/common/models.py:74 +#: catalog/common/models.py:86 msgid "Douban Drama Version" msgstr "豆瓣舞台剧版本" -#: catalog/common/models.py:75 +#: catalog/common/models.py:88 msgid "BooksTW Book" msgstr "博客来图书" -#: catalog/common/models.py:77 +#: catalog/common/models.py:90 msgid "Spotify Album" msgstr "Spotify专辑" -#: catalog/common/models.py:78 +#: catalog/common/models.py:91 msgid "Spotify Podcast" msgstr "Spotify播客" -#: catalog/common/models.py:87 +#: catalog/common/models.py:93 +msgid "Discogs Release" +msgstr "Discogs发行" + +#: catalog/common/models.py:96 +msgid "Discogs Master" +msgstr "Discogs作品" + +#: catalog/common/models.py:98 +msgid "MusicBrainz ID" +msgstr "MusicBrainz ID" + +#: catalog/common/models.py:104 msgid "IGDB Game" msgstr "IGDB游戏" -#: catalog/common/models.py:88 +#: catalog/common/models.py:105 msgid "BGG Boardgame" msgstr "BGG桌游" -#: catalog/common/models.py:89 +#: catalog/common/models.py:106 msgid "Steam Game" msgstr "Steam游戏" -#: catalog/common/models.py:91 +#: catalog/common/models.py:108 msgid "Apple Podcast" msgstr "苹果播客" -#: catalog/common/models.py:109 catalog/common/models.py:126 -#: catalog/common/models.py:139 catalog/jobs/discover.py:91 +#: catalog/common/models.py:126 catalog/common/models.py:147 +#: catalog/common/models.py:160 catalog/jobs/discover.py:92 #: common/templates/_header.html:25 #: journal/templates/_sidebar_user_mark_list.html:31 msgid "Book" msgstr "书" -#: catalog/common/models.py:110 +#: catalog/common/models.py:127 msgid "TV Serie" msgstr "电视剧集" -#: catalog/common/models.py:111 catalog/templates/_sidebar_edit.html:140 +#: catalog/common/models.py:128 catalog/templates/_sidebar_edit.html:140 msgid "TV Season" msgstr "电视分季" -#: catalog/common/models.py:112 +#: catalog/common/models.py:129 msgid "TV Episode" msgstr "电视单集" -#: catalog/common/models.py:113 catalog/common/models.py:127 -#: catalog/common/models.py:140 catalog/templates/_sidebar_edit.html:133 +#: catalog/common/models.py:130 catalog/common/models.py:148 +#: catalog/common/models.py:161 catalog/templates/_sidebar_edit.html:133 #: journal/templates/_sidebar_user_mark_list.html:34 msgid "Movie" msgstr "电影" -#: catalog/common/models.py:114 +#: catalog/common/models.py:131 msgid "Album" msgstr "专辑" -#: catalog/common/models.py:115 catalog/common/models.py:130 -#: catalog/common/models.py:143 common/templates/_header.html:41 +#: catalog/common/models.py:132 catalog/common/models.py:151 +#: catalog/common/models.py:164 common/templates/_header.html:41 #: journal/templates/_sidebar_user_mark_list.html:47 msgid "Game" msgstr "游戏" -#: catalog/common/models.py:116 +#: catalog/common/models.py:133 msgid "Podcast Program" msgstr "播客节目" -#: catalog/common/models.py:117 +#: catalog/common/models.py:135 msgid "Podcast Episode" msgstr "播客单集" -#: catalog/common/models.py:118 catalog/common/models.py:132 -#: catalog/common/models.py:145 common/templates/_header.html:45 +#: catalog/common/models.py:137 catalog/common/models.py:153 +#: catalog/common/models.py:166 common/templates/_header.html:45 #: journal/templates/_sidebar_user_mark_list.html:51 msgid "Performance" msgstr "演出" -#: catalog/common/models.py:119 +#: catalog/common/models.py:139 msgid "Production" msgstr "上演" -#: catalog/common/models.py:120 +#: catalog/common/models.py:141 msgid "Fanfic" msgstr "网文" -#: catalog/common/models.py:121 catalog/common/models.py:134 +#: catalog/common/models.py:142 catalog/common/models.py:155 msgid "Exhibition" msgstr "展览" -#: catalog/common/models.py:122 catalog/common/models.py:135 +#: catalog/common/models.py:143 catalog/common/models.py:156 #: journal/templates/collection.html:15 journal/templates/collection.html:22 #: journal/templates/collection_edit.html:9 #: journal/templates/collection_share.html:12 msgid "Collection" msgstr "收藏单" -#: catalog/common/models.py:128 catalog/common/models.py:141 +#: catalog/common/models.py:149 catalog/common/models.py:162 #: journal/templates/_sidebar_user_mark_list.html:37 msgid "TV" msgstr "剧集" -#: catalog/common/models.py:129 catalog/common/models.py:142 +#: catalog/common/models.py:150 catalog/common/models.py:163 #: common/templates/_header.html:37 #: journal/templates/_sidebar_user_mark_list.html:44 msgid "Music" msgstr "音乐" -#: catalog/common/models.py:131 catalog/common/models.py:144 +#: catalog/common/models.py:152 catalog/common/models.py:165 #: catalog/templates/_sidebar_edit.html:152 common/templates/_header.html:33 #: journal/templates/_sidebar_user_mark_list.html:41 msgid "Podcast" msgstr "播客" -#: catalog/common/models.py:133 +#: catalog/common/models.py:154 msgid "FanFic" msgstr "网文" -#: catalog/common/models.py:256 journal/models/collection.py:48 +#: catalog/common/models.py:283 journal/models/collection.py:51 msgid "title" msgstr "标题" -#: catalog/common/models.py:257 journal/models/collection.py:49 +#: catalog/common/models.py:284 journal/models/collection.py:52 msgid "description" msgstr "描述" -#: catalog/common/models.py:259 catalog/forms.py:26 +#: catalog/common/models.py:286 catalog/forms.py:26 msgid "Primary ID Type" msgstr "主要标识类型" -#: catalog/common/models.py:262 catalog/forms.py:31 +#: catalog/common/models.py:289 catalog/forms.py:31 msgid "Primary ID Value" msgstr "主要标识数据" -#: catalog/common/models.py:268 +#: catalog/common/models.py:295 msgid "metadata" msgstr "元数据" -#: catalog/common/models.py:270 +#: catalog/common/models.py:297 msgid "cover" msgstr "封面" -#: catalog/common/models.py:566 +#: catalog/common/models.py:611 msgid "source site" msgstr "来源站点" -#: catalog/common/models.py:568 +#: catalog/common/models.py:613 msgid "ID on source site" msgstr "来源站点标识" -#: catalog/common/models.py:570 +#: catalog/common/models.py:615 msgid "source url" msgstr "来源站点网址" -#: catalog/common/models.py:582 +#: catalog/common/models.py:630 msgid "IdType of the source site" msgstr "来源站点的主要标识类型" -#: catalog/common/models.py:588 +#: catalog/common/models.py:636 msgid "Primary Id on the source site" msgstr "来源站点的主要标识数据" -#: catalog/common/models.py:591 +#: catalog/common/models.py:639 msgid "url to the resource" msgstr "指向外部资源的网址" @@ -431,18 +443,18 @@ msgstr "出版发行" msgid "year of publication" msgstr "发行年份" -#: catalog/game/models.py:101 catalog/podcast/models.py:93 +#: catalog/game/models.py:101 catalog/podcast/models.py:97 msgid "date of publication" msgstr "发行日期" #: catalog/game/models.py:106 catalog/music/models.py:59 -#: catalog/tv/models.py:178 +#: catalog/tv/models.py:184 msgid "YYYY-MM-DD" msgstr "" #: catalog/game/models.py:110 catalog/movie/models.py:96 -#: catalog/performance/models.py:118 catalog/podcast/models.py:36 -#: catalog/tv/models.py:158 catalog/tv/models.py:320 +#: catalog/performance/models.py:121 catalog/podcast/models.py:40 +#: catalog/tv/models.py:164 catalog/tv/models.py:328 msgid "genre" msgstr "类型" @@ -451,31 +463,31 @@ msgid "platform" msgstr "平台" #: catalog/game/models.py:124 catalog/movie/models.py:131 -#: catalog/performance/models.py:208 catalog/performance/models.py:350 -#: catalog/podcast/models.py:50 catalog/templates/game.html:29 +#: catalog/performance/models.py:211 catalog/performance/models.py:353 +#: catalog/podcast/models.py:54 catalog/templates/game.html:29 #: catalog/templates/movie.html:58 catalog/templates/performance.html:33 #: catalog/templates/performanceproduction.html:33 #: catalog/templates/podcast.html:20 catalog/templates/tvseason.html:75 -#: catalog/templates/tvshow.html:70 catalog/tv/models.py:193 -#: catalog/tv/models.py:355 +#: catalog/templates/tvshow.html:70 catalog/tv/models.py:199 +#: catalog/tv/models.py:363 msgid "website" msgstr "网站" -#: catalog/movie/models.py:75 catalog/performance/models.py:132 -#: catalog/performance/models.py:274 catalog/tv/models.py:137 -#: catalog/tv/models.py:299 +#: catalog/movie/models.py:75 catalog/performance/models.py:135 +#: catalog/performance/models.py:277 catalog/tv/models.py:143 +#: catalog/tv/models.py:307 msgid "director" msgstr "导演" -#: catalog/movie/models.py:82 catalog/performance/models.py:139 -#: catalog/performance/models.py:281 catalog/tv/models.py:144 -#: catalog/tv/models.py:306 +#: catalog/movie/models.py:82 catalog/performance/models.py:142 +#: catalog/performance/models.py:284 catalog/tv/models.py:150 +#: catalog/tv/models.py:314 msgid "playwright" msgstr "编剧" -#: catalog/movie/models.py:89 catalog/performance/models.py:167 -#: catalog/performance/models.py:309 catalog/tv/models.py:151 -#: catalog/tv/models.py:313 +#: catalog/movie/models.py:89 catalog/performance/models.py:170 +#: catalog/performance/models.py:312 catalog/tv/models.py:157 +#: catalog/tv/models.py:321 msgid "actor" msgstr "演员" @@ -487,32 +499,32 @@ msgstr "演员" msgid "release date" msgstr "发布日期" -#: catalog/movie/models.py:115 catalog/tv/models.py:339 +#: catalog/movie/models.py:115 catalog/tv/models.py:347 #: journal/templates/_sidebar_user_mark_list.html:62 msgid "date" msgstr "日期" -#: catalog/movie/models.py:116 catalog/performance/models.py:80 -#: catalog/tv/models.py:340 +#: catalog/movie/models.py:116 catalog/performance/models.py:81 +#: catalog/tv/models.py:348 msgid "required" msgstr "必填" -#: catalog/movie/models.py:120 catalog/tv/models.py:344 +#: catalog/movie/models.py:120 catalog/tv/models.py:352 msgid "region or event" msgstr "地区或类型" -#: catalog/movie/models.py:122 catalog/tv/models.py:184 -#: catalog/tv/models.py:346 +#: catalog/movie/models.py:122 catalog/tv/models.py:190 +#: catalog/tv/models.py:354 msgid "Germany or Toronto International Film Festival" msgstr "德国或多伦多国际电影节" -#: catalog/movie/models.py:134 catalog/tv/models.py:196 -#: catalog/tv/models.py:358 +#: catalog/movie/models.py:134 catalog/tv/models.py:202 +#: catalog/tv/models.py:366 msgid "region" msgstr "地区" -#: catalog/movie/models.py:155 catalog/tv/models.py:217 -#: catalog/tv/models.py:379 +#: catalog/movie/models.py:155 catalog/tv/models.py:223 +#: catalog/tv/models.py:387 msgid "year" msgstr "年份" @@ -547,61 +559,61 @@ msgstr "介质类型" msgid "number of discs" msgstr "碟片数" -#: catalog/performance/models.py:64 catalog/performance/models.py:79 +#: catalog/performance/models.py:65 catalog/performance/models.py:80 msgid "name" msgstr "名字" -#: catalog/performance/models.py:65 catalog/performance/models.py:84 +#: catalog/performance/models.py:66 catalog/performance/models.py:85 msgid "role" msgstr "角色" -#: catalog/performance/models.py:85 +#: catalog/performance/models.py:86 msgid "optional" msgstr "可选" -#: catalog/performance/models.py:108 +#: catalog/performance/models.py:111 msgid "original name" msgstr "原名" -#: catalog/performance/models.py:146 catalog/performance/models.py:288 +#: catalog/performance/models.py:149 catalog/performance/models.py:291 msgid "original creator" msgstr "原始创作者" -#: catalog/performance/models.py:153 catalog/performance/models.py:295 +#: catalog/performance/models.py:156 catalog/performance/models.py:298 msgid "composer" msgstr "作曲" -#: catalog/performance/models.py:160 catalog/performance/models.py:302 +#: catalog/performance/models.py:163 catalog/performance/models.py:305 msgid "choreographer" msgstr "编舞" -#: catalog/performance/models.py:174 catalog/performance/models.py:316 +#: catalog/performance/models.py:177 catalog/performance/models.py:319 msgid "performer" msgstr "表演者" -#: catalog/performance/models.py:181 catalog/performance/models.py:323 +#: catalog/performance/models.py:184 catalog/performance/models.py:326 msgid "troupe" msgstr "剧团" -#: catalog/performance/models.py:188 catalog/performance/models.py:330 +#: catalog/performance/models.py:191 catalog/performance/models.py:333 msgid "crew" msgstr "工作人员" -#: catalog/performance/models.py:195 catalog/performance/models.py:337 +#: catalog/performance/models.py:198 catalog/performance/models.py:340 msgid "theater" msgstr "剧院" -#: catalog/performance/models.py:202 catalog/performance/models.py:344 +#: catalog/performance/models.py:205 catalog/performance/models.py:347 #: catalog/templates/performance.html:14 #: catalog/templates/performanceproduction.html:13 msgid "opening date" msgstr "上演日期" -#: catalog/performance/models.py:205 catalog/performance/models.py:347 +#: catalog/performance/models.py:208 catalog/performance/models.py:350 msgid "closing date" msgstr "结束日期" -#: catalog/podcast/models.py:44 +#: catalog/podcast/models.py:48 msgid "host" msgstr "主播" @@ -1292,17 +1304,17 @@ msgstr "登录用户可看到来自其它网站的搜索结果。" msgid "all seasons" msgstr "本剧所有季" -#: catalog/templates/tvseason.html:32 catalog/tv/models.py:263 +#: catalog/templates/tvseason.html:32 catalog/tv/models.py:271 msgid "season number" msgstr "本季序号" #: catalog/templates/tvseason.html:37 catalog/templates/tvshow.html:32 -#: catalog/tv/models.py:101 +#: catalog/tv/models.py:107 msgid "number of seasons" msgstr "季数" #: catalog/templates/tvseason.html:42 catalog/templates/tvshow.html:37 -#: catalog/tv/models.py:104 catalog/tv/models.py:266 +#: catalog/tv/models.py:110 catalog/tv/models.py:274 msgid "number of episodes" msgstr "集数" @@ -1310,28 +1322,28 @@ msgstr "集数" msgid "Editions" msgstr "版本" -#: catalog/tv/models.py:165 catalog/tv/models.py:327 +#: catalog/tv/models.py:171 catalog/tv/models.py:335 msgid "show time" msgstr "上映时间" -#: catalog/tv/models.py:177 +#: catalog/tv/models.py:183 msgid "Date" msgstr "日期" -#: catalog/tv/models.py:182 +#: catalog/tv/models.py:188 msgid "Region or Event" msgstr "地区或场合" -#: catalog/tv/models.py:219 catalog/tv/models.py:381 +#: catalog/tv/models.py:225 catalog/tv/models.py:389 msgid "episode length" msgstr "单集长度" -#: catalog/tv/models.py:404 +#: catalog/tv/models.py:412 #, python-brace-format msgid "{show_title} S{season_number}" msgstr "{show_title} 第{season_number}季" -#: catalog/tv/models.py:456 +#: catalog/tv/models.py:464 #, python-brace-format msgid "{season_title} E{episode_number}" msgstr "{season_title} 第{episode_number}集" @@ -1547,8 +1559,8 @@ msgstr "常用标签" msgid "Error" msgstr "错误" -#: common/templates/common/verify.html:19 users/account.py:106 -#: users/account.py:490 +#: common/templates/common/verify.html:19 users/account.py:105 +#: users/account.py:489 msgid "Verification email is being sent, please check your inbox." msgstr "验证邮件已发送，请查阅收件箱。" @@ -1679,12 +1691,12 @@ msgstr "关于 {item_title} 的评论" msgid "{username}'s podcast subscriptions" msgstr "{username} 的播客订阅" -#: journal/models/collection.py:25 journal/templates/collection_share.html:63 +#: journal/models/collection.py:26 journal/templates/collection_share.html:63 #: journal/templates/wrapped_share.html:29 msgid "note" msgstr "备注" -#: journal/models/common.py:26 journal/templates/collection_share.html:35 +#: journal/models/common.py:28 journal/templates/collection_share.html:35 #: journal/templates/comment.html:35 journal/templates/mark.html:88 #: journal/templates/tag_edit.html:40 journal/templates/wrapped_share.html:43 #: users/templates/users/data.html:47 users/templates/users/data.html:139 @@ -1692,7 +1704,7 @@ msgstr "备注" msgid "Public" msgstr "公开" -#: journal/models/common.py:27 journal/templates/collection_share.html:46 +#: journal/models/common.py:29 journal/templates/collection_share.html:46 #: journal/templates/comment.html:42 journal/templates/mark.html:95 #: journal/templates/wrapped_share.html:49 users/templates/users/data.html:55 #: users/templates/users/data.html:147 @@ -1700,7 +1712,7 @@ msgstr "公开" msgid "Followers Only" msgstr "仅关注者" -#: journal/models/common.py:28 journal/templates/collection_share.html:57 +#: journal/models/common.py:30 journal/templates/collection_share.html:57 #: journal/templates/comment.html:49 journal/templates/mark.html:102 #: journal/templates/wrapped_share.html:55 users/templates/users/data.html:63 #: users/templates/users/data.html:155 @@ -2039,7 +2051,7 @@ msgstr "不再看 {item}" msgid "performances reviewed" msgstr "评论过的演出" -#: journal/models/shelf.py:418 +#: journal/models/shelf.py:424 msgid "removed mark" msgstr "移除标记" @@ -2347,7 +2359,7 @@ msgstr "日历" msgid "annual summary" msgstr "年度小结" -#: journal/templates/profile.html:131 mastodon/api.py:677 +#: journal/templates/profile.html:131 mastodon/api.py:678 msgid "collection" msgstr "收藏单" @@ -2548,16 +2560,16 @@ msgstr "标签已更新" msgid "Summary posted to timeline." msgstr "总结已发布到时间轴" -#: mastodon/api.py:520 takahe/utils.py:514 +#: mastodon/api.py:521 takahe/utils.py:514 #, python-brace-format msgid "regarding {item_title}, may contain spoiler or triggering content" msgstr "关于 {item_title}，可能包含剧透或敏感内容" -#: mastodon/api.py:682 +#: mastodon/api.py:683 msgid "shared my collection" msgstr "分享我的收藏单" -#: mastodon/api.py:685 +#: mastodon/api.py:686 #, python-brace-format msgid "shared {username}'s collection" msgstr "分享 {username} 的收藏单" @@ -2622,7 +2634,7 @@ msgstr "播放" msgid "comment" msgstr "写短评" -#: social/templates/activity/create_collection.html:17 takahe/utils.py:553 +#: social/templates/activity/create_collection.html:17 takahe/utils.py:554 msgid "created collection" msgstr "创建了收藏单" @@ -2834,60 +2846,60 @@ msgstr "头像" msgid "Header picture" msgstr "背景图片" -#: users/account.py:86 +#: users/account.py:85 msgid "Invalid email address" msgstr "无效的电子邮件地址" -#: users/account.py:104 +#: users/account.py:103 msgid "Verification" msgstr "验证" -#: users/account.py:121 +#: users/account.py:120 msgid "Missing instance domain" msgstr "未指定实例域名" -#: users/account.py:142 +#: users/account.py:141 msgid "Error connecting to instance" msgstr "无法连接实例" -#: users/account.py:158 users/account.py:168 users/account.py:181 -#: users/account.py:204 users/account.py:229 +#: users/account.py:157 users/account.py:167 users/account.py:180 +#: users/account.py:203 users/account.py:228 msgid "Authentication failed" msgstr "认证失败" -#: users/account.py:159 +#: users/account.py:158 msgid "Invalid response from Fediverse instance." msgstr "联邦实例返回信息无效" -#: users/account.py:169 +#: users/account.py:168 msgid "Invalid cookie data." msgstr "无效cookie信息。" -#: users/account.py:175 +#: users/account.py:174 msgid "Invalid instance domain" msgstr "实例域名无效" -#: users/account.py:182 +#: users/account.py:181 msgid "Invalid token from Fediverse instance." msgstr "联邦实例返回了无效的认证令牌。" -#: users/account.py:205 users/account.py:559 +#: users/account.py:204 users/account.py:558 msgid "Invalid account data from Fediverse instance." msgstr "联邦实例返回了无效的账号数据。" -#: users/account.py:230 +#: users/account.py:229 msgid "Registration is for invitation only" msgstr "本站仅限邀请注册" -#: users/account.py:291 +#: users/account.py:290 msgid "This username is already in use." msgstr "用户名已被使用" -#: users/account.py:302 +#: users/account.py:301 msgid "This email address is already in use." msgstr "此电子邮件地址已被使用" -#: users/account.py:310 +#: users/account.py:309 msgid "" "\n" "\n" @@ -2897,7 +2909,7 @@ msgstr "" "\n" "如果你没有打算用此电子邮件地址注册或登录本站，请忽略此邮件；如果你确信账号存在安全风险，请更改注册邮件地址或与我们联系。" -#: users/account.py:316 +#: users/account.py:315 #, python-brace-format msgid "" "Click this link to verify your email address {email}\n" @@ -2907,7 +2919,7 @@ msgstr "" "请点击以下链接验证你的电子邮件地址 {email}\n" "{url}" -#: users/account.py:324 +#: users/account.py:323 #, python-brace-format msgid "" "Use this code to confirm login as {email}\n" @@ -2925,7 +2937,7 @@ msgstr "" "或点击以下链接登录{email}账号\n" "{url}" -#: users/account.py:331 +#: users/account.py:330 #, python-brace-format msgid "" "There is no account registered with this email address yet.{email}\n" @@ -2940,7 +2952,7 @@ msgstr "" "\n" "如果你还没有联邦宇宙身份，可以访问这里选择实例并创建一个： https://joinmastodon.org/zh/servers\n" -#: users/account.py:335 +#: users/account.py:334 #, python-brace-format msgid "" "\n" @@ -2954,51 +2966,51 @@ msgstr "" "或者点击以下链接\n" "{url}" -#: users/account.py:362 users/account.py:371 +#: users/account.py:361 users/account.py:370 msgid "Invalid verification code" msgstr "验证码无效或已过期" -#: users/account.py:390 +#: users/account.py:389 msgid "Invalid verification link" msgstr "验证链接无效或已过期" -#: users/account.py:407 users/account.py:413 +#: users/account.py:406 users/account.py:412 msgid "Email mismatch" msgstr "电子邮件地址不匹配" -#: users/account.py:417 users/account.py:469 +#: users/account.py:416 users/account.py:468 msgid "Email in use" msgstr "电子邮件地址已被注册" -#: users/account.py:422 +#: users/account.py:421 msgid "Unable to verify" msgstr "无法完成验证" -#: users/account.py:454 +#: users/account.py:453 msgid "Username in use" msgstr "用户名已被使用" -#: users/account.py:495 +#: users/account.py:494 msgid "Username all set." msgstr "用户名已设置。" -#: users/account.py:498 +#: users/account.py:497 msgid "Email removed from account." msgstr "电子邮件地址已取消关联。" -#: users/account.py:519 +#: users/account.py:518 msgid "Unable to update login information: identical identity." msgstr "无法更新登录信息：该身份与当前账号相同。" -#: users/account.py:529 +#: users/account.py:528 msgid "Unable to update login information: identity in use." msgstr "无法更新登录信息：该身份已被其它账号使用。" -#: users/account.py:555 +#: users/account.py:554 msgid "Login information updated." msgstr "登录信息已更新" -#: users/account.py:609 +#: users/account.py:608 msgid "Account mismatch." msgstr "账号信息不匹配。" @@ -3038,6 +3050,22 @@ msgstr "文件已上传，等待后台导入。" msgid "Invalid file." msgstr "无效文件。" +#: users/models/task.py:17 +msgid "Pending" +msgstr "等待" + +#: users/models/task.py:18 +msgid "Started" +msgstr "已开始" + +#: users/models/task.py:19 +msgid "Complete" +msgstr "完成" + +#: users/models/task.py:20 +msgid "Failed" +msgstr "失败" + #: users/models/user.py:49 msgid "Enter a valid username. This value may contain only unaccented lowercase a-z and uppercase A-Z letters, numbers, and _ characters." msgstr "输入用户名，限英文字母数字下划线，最多30个字符。" diff --git a/pyproject.toml b/pyproject.toml index d51ddbf9..b8f957b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,17 +1,6 @@ [tool.pyright] exclude = [ "media", ".venv", ".git", "playground", "catalog/*/tests.py", "journal/tests.py", "neodb", "**/migrations", "**/sites/douban_*", "neodb-takahe" ] reportIncompatibleVariableOverride = false -reportUnusedImport = false -reportUnknownVariableType = false -reportConstantRedefinition = false -reportUnusedCallResult = false -reportUnknownMemberType = false -reportUnknownArgumentType = false -reportAny = false -reportImplicitOverride = false -reportUninitializedInstanceVariable = false -reportMissingTypeStubs = false -reportIgnoreCommentWithoutRule = false [tool.djlint] ignore="T002,T003,H005,H006,H019,H020,H021,H023,H030,H031,D018"