From a6b0134b2957bd0b6c2267d00ab418a2b1e4580b Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 19 May 2024 16:32:59 -0400 Subject: [PATCH] more i18n --- catalog/book/models.py | 2 +- catalog/music/models.py | 2 +- catalog/templates/_actor.html | 11 +- catalog/templates/_crew.html | 7 +- catalog/templates/_fetch_failed.html | 3 +- .../templates/_item_card_metadata_album.html | 10 +- .../templates/_item_card_metadata_base.html | 2 +- .../_item_card_metadata_edition.html | 68 +- .../templates/_item_card_metadata_game.html | 14 +- .../templates/_item_card_metadata_movie.html | 12 +- .../_item_card_metadata_performance.html | 26 +- ...m_card_metadata_performanceproduction.html | 26 +- .../_item_card_metadata_podcast.html | 4 +- .../_item_card_metadata_tvseason.html | 12 +- .../templates/_item_card_metadata_tvshow.html | 12 +- .../templates/_item_card_metadata_work.html | 10 +- catalog/templates/_item_comments.html | 12 +- .../templates/_item_comments_by_episode.html | 8 +- catalog/templates/_item_reviews.html | 6 +- .../templates/_item_user_mark_history.html | 6 +- catalog/templates/_item_user_pieces.html | 20 +- catalog/templates/_people.html | 7 +- catalog/templates/_sidebar_search.html | 26 +- catalog/templates/album.html | 84 +- catalog/templates/catalog_history.html | 4 +- catalog/templates/discover.html | 14 +- catalog/templates/edition.html | 52 +- catalog/templates/fetch_pending.html | 6 +- catalog/templates/game.html | 20 +- catalog/templates/item_base.html | 44 +- catalog/templates/movie.html | 131 +- catalog/templates/performance.html | 52 +- catalog/templates/performanceproduction.html | 31 +- catalog/templates/podcast.html | 40 +- catalog/templates/podcast_episode_data.html | 11 +- catalog/templates/search_results.html | 42 +- catalog/templates/tvseason.html | 142 +- catalog/templates/tvshow.html | 133 +- catalog/templates/work.html | 22 +- common/templates/503.html | 4 +- common/templates/common/error.html | 2 +- journal/importers/letterboxd.py | 1 + journal/importers/opml.py | 1 + journal/templates/action_boost_post.html | 2 +- journal/templates/action_like_post.html | 5 +- journal/templates/action_open_post.html | 2 +- journal/templates/action_reply_piece.html | 2 +- journal/templates/profile.html | 26 +- journal/templates/review_edit.html | 11 +- locale/zh_Hans/LC_MESSAGES/django.po | 1376 ++++++++++------- mastodon/api.py | 28 +- mastodon/models.py | 7 + .../templates/activity/create_collection.html | 2 +- .../activity/feature_collection.html | 2 +- .../templates/activity/like_collection.html | 4 +- social/templates/feed.html | 4 +- social/templates/feed_data.html | 7 +- users/account.py | 128 +- users/templates/users/announcements.html | 6 +- .../users/fetch_identity_failed.html | 2 +- .../users/fetch_identity_pending.html | 6 +- users/templates/users/home_anonymous.html | 3 +- users/templates/users/preferences.html | 95 +- users/templates/users/register.html | 31 +- users/templates/users/relationship_list.html | 8 +- users/templates/users/verify_email.html | 10 +- 66 files changed, 1432 insertions(+), 1477 deletions(-) diff --git a/catalog/book/models.py b/catalog/book/models.py index f0df61f2..fb56bcf5 100644 --- a/catalog/book/models.py +++ b/catalog/book/models.py @@ -113,7 +113,7 @@ class Edition(Item): _("language"), null=True, blank=True, default=None, max_length=500 ) pub_house = jsondata.CharField( - _("publisher"), null=True, blank=False, default=None, max_length=500 + _("publishing house"), null=True, blank=False, default=None, max_length=500 ) pub_year = jsondata.IntegerField( _("publication year"), diff --git a/catalog/music/models.py b/catalog/music/models.py index 606bdcea..e30725a3 100644 --- a/catalog/music/models.py +++ b/catalog/music/models.py @@ -94,7 +94,7 @@ class Album(Item): media = jsondata.CharField(_("media type"), blank=True, default="", max_length=500) bandcamp_album_id = jsondata.CharField(blank=True, default="", max_length=500) disc_count = jsondata.IntegerField( - _("number of disc"), blank=True, default="", max_length=500 + _("number of discs"), blank=True, default="", max_length=500 ) def get_embed_link(self): diff --git a/catalog/templates/_actor.html b/catalog/templates/_actor.html index bc47eeee..c8f3a677 100644 --- a/catalog/templates/_actor.html +++ b/catalog/templates/_actor.html @@ -1,14 +1,17 @@ +{% load i18n %} {% if people %} - {% if role %}{{ role }}：{% endif %} + {% if role %} + {% trans role %}: + {% endif %} {% for p in people %} {% if forloop.counter <= max %} - {% if not forloop.first %}、{% endif %} + {% if not forloop.first %}/{% endif %} {{ p.name }} - {% if p.role.strip %}(饰{{ p.role }}){% endif %} + {% if p.role.strip %}(as {{ p.role }}){% endif %} {% elif forloop.last %} - 等 + … {% endif %} {% endfor %} diff --git a/catalog/templates/_crew.html b/catalog/templates/_crew.html index 9cb7fd5f..777d3541 100644 --- a/catalog/templates/_crew.html +++ b/catalog/templates/_crew.html @@ -1,12 +1,13 @@ +{% load i18n %} {% for role, list in people.items %}
- {{ role }}： + {% trans role %}: {% for p in list %} {% if forloop.counter <= max %} - {% if not forloop.first %}、{% endif %} + {% if not forloop.first %}/{% endif %} {{ p }} {% elif forloop.last %} - 等 + … {% endif %} {% endfor %}
diff --git a/catalog/templates/_fetch_failed.html b/catalog/templates/_fetch_failed.html index ba1792e6..4c7dd620 100644 --- a/catalog/templates/_fetch_failed.html +++ b/catalog/templates/_fetch_failed.html @@ -1,5 +1,4 @@

- 无法加载条目，请确认链接正确。 - 部分网站可能删除条目或隐藏条目为仅登录可见，欢迎在本站手工添加这些条目。 + {% trans "Unable to fetch from the link, please check again. Some sites may require login for certain links, please manually create them here." %}

diff --git a/catalog/templates/_item_card_metadata_album.html b/catalog/templates/_item_card_metadata_album.html index 15d35faf..ff5cb4fc 100644 --- a/catalog/templates/_item_card_metadata_album.html +++ b/catalog/templates/_item_card_metadata_album.html @@ -4,16 +4,18 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} {% include '_people.html' with people=item.artist role='' max=2 %} - {% include '_people.html' with people=item.genre role='流派' max=5 %} + {% include '_people.html' with people=item.genre role='genre' max=5 %}
{% endblock brief %} {% block full %}
- {% if item.release_date %}发行时间：{{ item.release_date }}{% endif %} - {% include '_people.html' with people=item.company role='发行方' max=2 %} + {% if item.release_date %} + {% trans "release date" %} {{ item.release_date }} + {% endif %} + {% include '_people.html' with people=item.company role='publisher' max=2 %}
diff --git a/catalog/templates/_item_card_metadata_base.html b/catalog/templates/_item_card_metadata_base.html index ce28e463..94921873 100644 --- a/catalog/templates/_item_card_metadata_base.html +++ b/catalog/templates/_item_card_metadata_base.html @@ -29,7 +29,7 @@ {% endif %} {% if item.parent_item %} - 所属{{ item.parent_item.type.label }}：{{ item.parent_item.title }} + {% trans "part of" %} {{ item.parent_item.type.label }}: {{ item.parent_item.title }} {% endif %} diff --git a/catalog/templates/_item_card_metadata_edition.html b/catalog/templates/_item_card_metadata_edition.html index 241a5b03..244abfa2 100644 --- a/catalog/templates/_item_card_metadata_edition.html +++ b/catalog/templates/_item_card_metadata_edition.html @@ -2,44 +2,42 @@ {% load humanize %} {% load i18n %} {% block brief %} - {% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) - {% endif %} - {% include '_people.html' with people=item.author role='作者' max=2 %} - {% include '_people.html' with people=item.translator role='译者' max=2 %} - {% include '_people.html' with people=item.director role='导演' max=2 %} - {% include '_people.html' with people=item.hosts role='' max=2 %} - {% include '_people.html' with people=item.artist role='' max=2 %} - {% include '_people.html' with people=item.developer role='' max=2 %} - {% if item.pub_house %}{{ item.pub_house }}{% endif %} - {% if item.pub_year %} - - {{ item.pub_year }}{% trans '年' %} - {% if item.pub_month %} - {{ item.pub_month }}{% trans '月' %} - {% endif %} - - {% endif %} - {% if item.release_date %}{{ item.release_date }}{% endif %} - {% include '_people.html' with people=item.genre role='' max=2 %} - {% include '_people.html' with people=item.troupe role='' max=2 %} - {% include '_people.html' with people=item.location role='' max=2 %} - {% comment %} {% include '_people.html' with people=item.language role='' max=5 %} {% endcomment %} - {% include '_people.html' with people=item.platform role='' max=5 %} - {% if item.show %} - {{ item.show.type.label }}：{{ item.show.title }} - {% endif %} +
+ {% if item.rating %} + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) + {% endif %} + {% include '_people.html' with people=item.author role='author' max=2 %} + {% include '_people.html' with people=item.translator role='translator' max=2 %} + {% include '_people.html' with people=item.director role='director' max=2 %} + {% include '_people.html' with people=item.hosts role='' max=2 %} + {% include '_people.html' with people=item.artist role='' max=2 %} + {% include '_people.html' with people=item.developer role='' max=2 %} + {% if item.pub_house %}{{ item.pub_house }}{% endif %} + {% if item.pub_year %} + + {{ item.pub_year }} + {% if item.pub_month %}-{{ item.pub_month }}{% endif %} + + {% endif %} + {% if item.release_date %}{{ item.release_date }}{% endif %} + {% include '_people.html' with people=item.genre role='' max=2 %} + {% include '_people.html' with people=item.troupe role='' max=2 %} + {% include '_people.html' with people=item.location role='' max=2 %} + {% comment %} {% include '_people.html' with people=item.language role='' max=5 %} {% endcomment %} + {% include '_people.html' with people=item.platform role='' max=5 %} + {% if item.show %} + {{ item.show.type.label }}: {{ item.show.title }} + {% endif %} +
{% endblock brief %} {% block full %} {% comment %} {% if item.actor %} - {% include '_people.html' with people=item.actor role='主演' max=2 %} + {% include '_people.html' with people=item.actor role='actor' max=2 %}
{% endif %} {% endcomment %} - {% if item.other_title %} - {% include '_people.html' with people=item.other_title role='又名' max=2 %} -
- {% endif %} -
- {% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %} -
+ {% include '_people.html' with people=item.other_title role='other title' max=2 %} +{% endif %} +
+ {% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %} +
{% endblock full %} diff --git a/catalog/templates/_item_card_metadata_game.html b/catalog/templates/_item_card_metadata_game.html index a2c8468c..d9c354e1 100644 --- a/catalog/templates/_item_card_metadata_game.html +++ b/catalog/templates/_item_card_metadata_game.html @@ -4,20 +4,18 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) - {% endif %} - {% if item.other_title %} - {% include '_people.html' with people=item.other_title role='又名' max=2 %} + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} + {% include '_people.html' with people=item.other_title role='other title' max=2 %} {% if item.release_date %}{{ item.release_date }}{% endif %}
{% endblock brief %} {% block full %}
- {% include '_people.html' with people=item.genre role='类型' max=2 %} - {% include '_people.html' with people=item.platform role='平台' max=5 %} - {% include '_people.html' with people=item.developer role='研发' max=2 %} - {% include '_people.html' with people=item.publisher role='发行' max=2 %} + {% include '_people.html' with people=item.genre role='genre' max=2 %} + {% include '_people.html' with people=item.platform role='platform' max=5 %} + {% include '_people.html' with people=item.developer role='developer' max=2 %} + {% include '_people.html' with people=item.publisher role='publisher' max=2 %}
{% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %} diff --git a/catalog/templates/_item_card_metadata_movie.html b/catalog/templates/_item_card_metadata_movie.html index 43dfcde5..16957b8a 100644 --- a/catalog/templates/_item_card_metadata_movie.html +++ b/catalog/templates/_item_card_metadata_movie.html @@ -4,18 +4,14 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} - {% include '_people.html' with people=item.director role='导演' max=2 %} - {% include '_people.html' with people=item.actor role='主演' max=2 %} + {% include '_people.html' with people=item.director role='director' max=2 %} + {% include '_people.html' with people=item.actor role='actor' max=2 %}
{% endblock brief %} {% block full %} -
- {% if item.other_title %} - {% include '_people.html' with people=item.other_title role='又名' max=5 %} - {% endif %} -
+
{% include '_people.html' with people=item.other_title role='other title' max=2 %}
{% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %}
diff --git a/catalog/templates/_item_card_metadata_performance.html b/catalog/templates/_item_card_metadata_performance.html index 11282516..fb267b2a 100644 --- a/catalog/templates/_item_card_metadata_performance.html +++ b/catalog/templates/_item_card_metadata_performance.html @@ -4,24 +4,24 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} - {% include '_people.html' with people=item.genre role='类型' max=2 %} - {% include '_people.html' with people=item.playwright role='编剧' max=2 %} - {% include '_people.html' with people=item.composer role='作曲' max=2 %} - {% include '_people.html' with people=item.choreographer role='编舞' max=2 %} - {% include '_people.html' with people=item.orig_creator role='原作' max=2 %} + {% include '_people.html' with people=item.genre role='genre' max=2 %} + {% include '_people.html' with people=item.playwright role='playwright' max=2 %} + {% include '_people.html' with people=item.composer role='composer' max=2 %} + {% include '_people.html' with people=item.choreographer role='choreographer' max=2 %} + {% include '_people.html' with people=item.orig_creator role='original creator' max=2 %}
{% endblock brief %} {% block full %}
- {% include '_people.html' with people=item.other_title role='又名' max=2 %} - {% include '_people.html' with people=item.language role='语言' max=5 %} - {% include '_people.html' with people=item.troupe role='剧团' max=2 %} - {% include '_people.html' with people=item.location role='剧院' max=2 %} - {% include '_people.html' with people=item.director role='导演' max=2 %} - {% include '_actor.html' with people=item.actor role='主演' max=5 %} - {% include '_people.html' with people=item.performer role='表演者' max=5 %} + {% include '_people.html' with people=item.other_title role='other title' max=2 %} + {% include '_people.html' with people=item.language role='language' max=5 %} + {% include '_people.html' with people=item.troupe role='troupe' max=2 %} + {% include '_people.html' with people=item.location role='theater' max=2 %} + {% include '_people.html' with people=item.director role='director' max=2 %} + {% include '_actor.html' with people=item.actor role='actor' max=5 %} + {% include '_people.html' with people=item.performer role='performer' max=5 %}
{% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %} diff --git a/catalog/templates/_item_card_metadata_performanceproduction.html b/catalog/templates/_item_card_metadata_performanceproduction.html index dee2c2b2..3ce2e640 100644 --- a/catalog/templates/_item_card_metadata_performanceproduction.html +++ b/catalog/templates/_item_card_metadata_performanceproduction.html @@ -4,24 +4,24 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} - {% include '_people.html' with people=item.genre role='类型' max=2 %} - {% include '_people.html' with people=item.language role='语言' max=5 %} - {% include '_people.html' with people=item.troupe role='剧团' max=2 %} - {% include '_people.html' with people=item.location role='剧院' max=2 %} - {% include '_people.html' with people=item.director role='导演' max=2 %} - {% include '_people.html' with people=item.orig_creator role='原作' max=2 %} + {% include '_people.html' with people=item.genre role='genre' max=2 %} + {% include '_people.html' with people=item.language role='language' max=5 %} + {% include '_people.html' with people=item.troupe role='troupe' max=2 %} + {% include '_people.html' with people=item.location role='theater' max=2 %} + {% include '_people.html' with people=item.director role='director' max=2 %} + {% include '_people.html' with people=item.orig_creator role='original creator' max=2 %}
{% endblock brief %} {% block full %}
- {% include '_people.html' with people=item.other_title role='又名' max=2 %} - {% include '_people.html' with people=item.playwright role='编剧' max=2 %} - {% include '_people.html' with people=item.composer role='作曲' max=2 %} - {% include '_people.html' with people=item.choreographer role='编舞' max=2 %} - {% include '_actor.html' with people=item.actor role='主演' max=2 %} - {% include '_people.html' with people=item.performer role='表演者' max=2 %} + {% include '_people.html' with people=item.other_title role='other title' max=2 %} + {% include '_people.html' with people=item.playwright role='playwright' max=2 %} + {% include '_people.html' with people=item.composer role='composer' max=2 %} + {% include '_people.html' with people=item.choreographer role='choreographer' max=2 %} + {% include '_actor.html' with people=item.actor role='actor' max=2 %} + {% include '_people.html' with people=item.performer role='performer' max=2 %}
{% if not hide_brief %}{{ item.brief | default:item.parent_item.brief | linebreaksbr }}{% endif %} diff --git a/catalog/templates/_item_card_metadata_podcast.html b/catalog/templates/_item_card_metadata_podcast.html index 66b94549..2c611b08 100644 --- a/catalog/templates/_item_card_metadata_podcast.html +++ b/catalog/templates/_item_card_metadata_podcast.html @@ -4,9 +4,9 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} - {% include '_people.html' with people=item.hosts role='主播' max=5 %} + {% include '_people.html' with people=item.hosts role='host' max=5 %}
{% endblock brief %} {% block full %} diff --git a/catalog/templates/_item_card_metadata_tvseason.html b/catalog/templates/_item_card_metadata_tvseason.html index 43dfcde5..16957b8a 100644 --- a/catalog/templates/_item_card_metadata_tvseason.html +++ b/catalog/templates/_item_card_metadata_tvseason.html @@ -4,18 +4,14 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} - {% include '_people.html' with people=item.director role='导演' max=2 %} - {% include '_people.html' with people=item.actor role='主演' max=2 %} + {% include '_people.html' with people=item.director role='director' max=2 %} + {% include '_people.html' with people=item.actor role='actor' max=2 %}
{% endblock brief %} {% block full %} -
- {% if item.other_title %} - {% include '_people.html' with people=item.other_title role='又名' max=5 %} - {% endif %} -
+
{% include '_people.html' with people=item.other_title role='other title' max=2 %}
{% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %}
diff --git a/catalog/templates/_item_card_metadata_tvshow.html b/catalog/templates/_item_card_metadata_tvshow.html index 43dfcde5..16957b8a 100644 --- a/catalog/templates/_item_card_metadata_tvshow.html +++ b/catalog/templates/_item_card_metadata_tvshow.html @@ -4,18 +4,14 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} - {% include '_people.html' with people=item.director role='导演' max=2 %} - {% include '_people.html' with people=item.actor role='主演' max=2 %} + {% include '_people.html' with people=item.director role='director' max=2 %} + {% include '_people.html' with people=item.actor role='actor' max=2 %}
{% endblock brief %} {% block full %} -
- {% if item.other_title %} - {% include '_people.html' with people=item.other_title role='又名' max=5 %} - {% endif %} -
+
{% include '_people.html' with people=item.other_title role='other title' max=2 %}
{% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %}
diff --git a/catalog/templates/_item_card_metadata_work.html b/catalog/templates/_item_card_metadata_work.html index 40e93fa5..51c01ff4 100644 --- a/catalog/templates/_item_card_metadata_work.html +++ b/catalog/templates/_item_card_metadata_work.html @@ -4,17 +4,13 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }} {% trans "ratings" %}) {% endif %} - {% include '_people.html' with people=item.author role='作者' max=2 %} + {% include '_people.html' with people=item.author role='author' max=2 %}
{% endblock brief %} {% block full %} -
- {% if item.other_title %} - {% include '_people.html' with people=item.other_title role='又名' max=5 %} - {% endif %} -
+
{% include '_people.html' with people=item.other_title role='other title' max=2 %}
{% if not hide_brief %}{{ item.brief | linebreaksbr }}{% endif %}
diff --git a/catalog/templates/_item_comments.html b/catalog/templates/_item_comments.html index d296b54b..6adfc17d 100644 --- a/catalog/templates/_item_comments.html +++ b/catalog/templates/_item_comments.html @@ -7,7 +7,7 @@ {% if item.class_name == "tvseason" and not request.GET.last %} {% if item.all_episodes %}
- 全部 + {% trans "all" %} {% for ep in item.all_episodes %} - 使用编辑功能批量获取或手工添加单集子条目后可开启分集短评。 - [不再提示] + + {% trans "edit this item to fetch or add episode list here" %} + + [{% trans "hide this tooltip" %}]

{% endif %} {% endif %} @@ -77,9 +79,9 @@ - + {% endif %} {% empty %} -
{% trans '暂无' %}
+
{% trans 'nothing more.' %}
{% endfor %} diff --git a/catalog/templates/_item_comments_by_episode.html b/catalog/templates/_item_comments_by_episode.html index 366c7ee1..f0c3fb30 100644 --- a/catalog/templates/_item_comments_by_episode.html +++ b/catalog/templates/_item_comments_by_episode.html @@ -10,7 +10,7 @@ 全部 + hx-target="#comments">{% trans "all" %} {% for ep in item.all_episodes %} @@ -32,7 +32,7 @@ {% else %} {% endif %} - 写该集短评 + {% trans "comment this episode" %}

@@ -75,10 +75,10 @@ - + {% endif %} {% empty %} -
{% trans '暂无' %}
+
{% trans 'nothing more.' %}
{% endfor %}
diff --git a/catalog/templates/_item_reviews.html b/catalog/templates/_item_reviews.html index 814a51c5..69ce5006 100644 --- a/catalog/templates/_item_reviews.html +++ b/catalog/templates/_item_reviews.html @@ -23,7 +23,7 @@ {{ review.created_time|date }} - 评论 + {% trans "review" %} {% if review.item != item %} {{ review.item.title }}{{ comment.item.title_deco }} @@ -40,9 +40,9 @@ - + {% endif %} {% empty %} -
{% trans '暂无' %}
+
{% trans 'nothing more.' %}
{% endfor %} diff --git a/catalog/templates/_item_user_mark_history.html b/catalog/templates/_item_user_mark_history.html index 856ec87f..3f296903 100644 --- a/catalog/templates/_item_user_mark_history.html +++ b/catalog/templates/_item_user_mark_history.html @@ -11,7 +11,7 @@ {% empty %} -
  • 无标记历史
    • +
  • {% trans "no history." %}
    • {% endfor %}
    @@ -19,7 +19,7 @@ + hx-confirm="{% trans "sure to clear mark history?" %}">{% trans "clear mark history" %} -

    清除标记历史不会删除或改变现有标记

    +

    {% trans "clear history will not remove current mark" %}

    diff --git a/catalog/templates/_item_user_pieces.html b/catalog/templates/_item_user_pieces.html index 1ca2b7ee..9491f000 100644 --- a/catalog/templates/_item_user_pieces.html +++ b/catalog/templates/_item_user_pieces.html @@ -1,7 +1,7 @@ {% load user_actions %}
    - 我的标签 + {% trans "my tags" %} {% if not mark.tags %} @@ -36,7 +36,7 @@
    - 我的短评 + {% trans "my comments" %} {% if not mark.comment %} @@ -88,13 +88,13 @@ {% comment %} {{ comment.created_time|date }} {% endcomment %}

    - 评{{ comment.item.title }}: {{ comment.html|safe }} + {{ comment.item.title }}: {{ comment.html|safe }}

    {% endfor %}
    - 我的评论 + {% trans "my review" %} {% if not review %} @@ -127,12 +127,14 @@ {{ review.title }}

    {% else %} - + {% comment %} + {% trans "nothing so far." %} + {% endcomment %} {% endif %}
    - 我的收藏单 + {% trans "my collection" %} 0 %}{% endif %}

    {% empty %} - + {% comment %} + {% trans "nothing so far." %} + {% endcomment %} {% endfor %}
    {% if mark.logs %}
    - 标记历史 + {% trans "mark history" %} diff --git a/catalog/templates/_people.html b/catalog/templates/_people.html index c13abbba..6ffe43d9 100644 --- a/catalog/templates/_people.html +++ b/catalog/templates/_people.html @@ -1,12 +1,15 @@ +{% load i18n %} {% if people %} - {% if role %}{{ role }}：{% endif %} + {% if role %} + {% trans role %}: + {% endif %} {% for p in people %} {% if forloop.counter <= max %} {% if not forloop.first %}/{% endif %} {{ p }} {% elif forloop.last %} - 等 + … {% endif %} {% endfor %} diff --git a/catalog/templates/_sidebar_search.html b/catalog/templates/_sidebar_search.html index 9e6417b6..42750cb8 100644 --- a/catalog/templates/_sidebar_search.html +++ b/catalog/templates/_sidebar_search.html @@ -1,43 +1,37 @@ {% load static %} {% load i18n %} {% load l10n %} -
    -
    {% trans '没有想要的结果？' %}
    +
    {% trans 'Not the result you are looking for?' %}

    - 如果在 + Paste the link into the search box if you have found the entry you are looking for on these sites: {% for site in sites %} {{ site }} {% if not forloop.last %}/{% endif %} {% endfor %} - 找到了条目，可以在搜索栏中输入完整链接提交。

    -

    当然也可以手工创建条目：

    +

    {% trans "Or you may create items manually" %}:

    diff --git a/catalog/templates/album.html b/catalog/templates/album.html index 34162ea7..55a87735 100644 --- a/catalog/templates/album.html +++ b/catalog/templates/album.html @@ -9,109 +9,49 @@ {% load duration %} {% block details %} -
    - {% if item.artist %} - {% trans '艺术家：' %} - {% for artist in item.artist %} - 5 %}style="display: none;"{% endif %}> - {{ artist }} - {% if not forloop.last %}/{% endif %} - - {% endfor %} - {% if item.artist|length > 5 %} - {% trans '更多' %} - - {% endif %} - {% endif %} -
    -
    - {% if item.company %} - {% trans '发行方：' %} - {% for company in item.company %} - 5 %}style="display: none;"{% endif %}> - {{ company }} - {% if not forloop.last %}/{% endif %} - - {% endfor %} - {% if item.company|length > 5 %} - {% trans '更多' %} - - {% endif %} - {% endif %} -
    +
    {% include '_people.html' with people=item.other_title role='other title' max=5 %}
    +
    {% include '_people.html' with people=item.artist role='artist' max=5 %}
    +
    {% include '_people.html' with people=item.company role='publisher' max=5 %}
    {% if item.release_date %} - {% trans '发行日期：' %}{{ item.release_date }} + {% trans 'release date' %}: {{ item.release_date }} {% endif %}
    {% if item.duration %} - {% trans '时长：' %}{{ item.duration|duration_format:1000 }} - {% endif %} -
    -
    - {% if item.genre %} - {% trans '流派：' %} - {% for genre in item.genre %} - {{ genre }} - {% if not forloop.last %}/{% endif %} - {% endfor %} + {% trans 'duration' %}: {{ item.duration|duration_format:1000 }} {% endif %}
    +
    {% include '_people.html' with people=item.genre role='genre' max=5 %}
    {% if item.barcode %} - {% trans '条形码：' %}{{ item.barcode }} - {% endif %} -
    -
    - {% if item.other_title %} - {% trans '又名：' %} - {% for t in item.other_title %} - {{ t }} - {% if not forloop.last %}/{% endif %} - {% endfor %} + {% trans 'barcode' %}{{ item.barcode }} {% endif %}
    {% if item.album_type %} - {% trans '专辑类型：' %}{{ item.album_type }} + {% trans 'album type' %}: {{ item.album_type }} {% endif %}
    {% if item.media %} - {% trans '介质：' %}{{ item.media }} + {% trans 'album media' %}: {{ item.media }} {% endif %}
    {% if item.disc_count %} - {% trans '碟片数：' %}{{ item.disc_count }} + {% trans 'number of discs' %}: {{ item.disc_count }} {% endif %}
    {% endblock %} {% block content %} {% if item.track_list %} -
    曲目
    +
    tracks

    {{ item.track_list | linebreaksbr }}

    {% endif %} {% if item.get_embed_link %} -
    播放
    +
    play this album