diff --git a/catalog/management/commands/discover.py b/catalog/management/commands/discover.py index fd6ac864..fc4bd97c 100644 --- a/catalog/management/commands/discover.py +++ b/catalog/management/commands/discover.py @@ -46,7 +46,7 @@ class Command(BaseCommand): ] gallery_list = [] for category in gallery_categories: - days = 14 + days = 30 item_ids = [] while len(item_ids) < MAX_GALLERY_ITEMS / 2 and days < 150: item_ids = self.get_popular_item_ids(category, days) diff --git a/catalog/templates/catalog_edit.html b/catalog/templates/catalog_edit.html index 2e659daa..2254de18 100644 --- a/catalog/templates/catalog_edit.html +++ b/catalog/templates/catalog_edit.html @@ -5,7 +5,7 @@ {% load oauth_token %} {% load truncate %} - + diff --git a/catalog/templates/discover.html b/catalog/templates/discover.html index e2dd3989..910adc4f 100644 --- a/catalog/templates/discover.html +++ b/catalog/templates/discover.html @@ -6,7 +6,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/catalog/templates/embed_base.html b/catalog/templates/embed_base.html index e20d0154..11461ff9 100644 --- a/catalog/templates/embed_base.html +++ b/catalog/templates/embed_base.html @@ -9,7 +9,7 @@ {% load strip_scheme %} {% load thumb %} - + diff --git a/catalog/templates/fetch_pending.html b/catalog/templates/fetch_pending.html index 03173f4d..e4ebdcf0 100644 --- a/catalog/templates/fetch_pending.html +++ b/catalog/templates/fetch_pending.html @@ -9,7 +9,7 @@ {% load highlight %} {% load thumb %} - + diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html index ffd7693d..3c31e50b 100644 --- a/catalog/templates/item_base.html +++ b/catalog/templates/item_base.html @@ -11,7 +11,7 @@ {% load user_actions %} {% load duration %} - + diff --git a/catalog/templates/item_mark_list.html b/catalog/templates/item_mark_list.html index 7e6c8be3..145bf03e 100644 --- a/catalog/templates/item_mark_list.html +++ b/catalog/templates/item_mark_list.html @@ -9,7 +9,7 @@ {% load user_actions %} {% load duration %} - + diff --git a/catalog/templates/item_review_list.html b/catalog/templates/item_review_list.html index 0cc76e8e..f5241658 100644 --- a/catalog/templates/item_review_list.html +++ b/catalog/templates/item_review_list.html @@ -9,7 +9,7 @@ {% load user_actions %} {% load duration %} - + diff --git a/catalog/templates/search_results.html b/catalog/templates/search_results.html index bed3b7d0..59694584 100644 --- a/catalog/templates/search_results.html +++ b/catalog/templates/search_results.html @@ -9,11 +9,11 @@ {% load highlight %} {% load thumb %} - + - {{ site_name }} - {% trans '搜索结果' %} + {{ site_name }} - {% trans '搜索' %} {{ request.GET.q }} {% include "common_libs.html" with jquery=0 v2=1 %} diff --git a/catalog/views.py b/catalog/views.py index fe52ddcc..128e32a8 100644 --- a/catalog/views.py +++ b/catalog/views.py @@ -258,7 +258,11 @@ def merge(request, item_path, item_uuid): if not new_item or new_item.is_deleted or new_item.merged_to_item_id: messages.add_message(request, messages.ERROR, _("不能合并到一个被删除或合并过的条目。")) return redirect(item.url) - if new_item.class_name != item.class_name: + if item.class_name == "tvseason" and new_item.class_name == "tvshow": + pass + elif item.class_name == "tvshow" and new_item.class_name == "tvseason": + pass + elif new_item.class_name != item.class_name: messages.add_message( request, messages.ERROR, diff --git a/common/templates/400.html b/common/templates/400.html index 3996b689..6a3ab86a 100644 --- a/common/templates/400.html +++ b/common/templates/400.html @@ -7,7 +7,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/common/templates/403.html b/common/templates/403.html index b3633a8c..130e08d2 100644 --- a/common/templates/403.html +++ b/common/templates/403.html @@ -7,7 +7,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/common/templates/404.html b/common/templates/404.html index e1bb5901..b550f0ee 100644 --- a/common/templates/404.html +++ b/common/templates/404.html @@ -7,7 +7,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/common/templates/500.html b/common/templates/500.html index 41d63a12..5c027123 100644 --- a/common/templates/500.html +++ b/common/templates/500.html @@ -7,7 +7,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/common/templates/503.html b/common/templates/503.html index 302115a6..d2343e03 100644 --- a/common/templates/503.html +++ b/common/templates/503.html @@ -1,5 +1,5 @@ - + diff --git a/common/templates/common/error.html b/common/templates/common/error.html index fec60e03..721d6dc4 100644 --- a/common/templates/common/error.html +++ b/common/templates/common/error.html @@ -7,7 +7,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/journal/templates/collection.html b/journal/templates/collection.html index 9800d40d..a3a2068a 100644 --- a/journal/templates/collection.html +++ b/journal/templates/collection.html @@ -10,7 +10,7 @@ {% load collection %} {% load user_actions %} - + diff --git a/journal/templates/collection_edit.html b/journal/templates/collection_edit.html index 496c57ba..9c0a9bfe 100644 --- a/journal/templates/collection_edit.html +++ b/journal/templates/collection_edit.html @@ -5,7 +5,7 @@ {% load oauth_token %} {% load truncate %} - + diff --git a/journal/templates/piece_delete.html b/journal/templates/piece_delete.html index b185f39d..804b6f05 100644 --- a/journal/templates/piece_delete.html +++ b/journal/templates/piece_delete.html @@ -5,7 +5,7 @@ {% load oauth_token %} {% load truncate %} - + diff --git a/journal/templates/profile.html b/journal/templates/profile.html index 88d6745f..4d61870c 100644 --- a/journal/templates/profile.html +++ b/journal/templates/profile.html @@ -6,7 +6,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/journal/templates/review.html b/journal/templates/review.html index e6d42767..8ca74da0 100644 --- a/journal/templates/review.html +++ b/journal/templates/review.html @@ -8,7 +8,7 @@ {% load user_actions %} {% load duration %} - + diff --git a/journal/templates/review_edit.html b/journal/templates/review_edit.html index 6a6d6ed5..fa986b00 100644 --- a/journal/templates/review_edit.html +++ b/journal/templates/review_edit.html @@ -6,7 +6,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/journal/templates/user_collection_list.html b/journal/templates/user_collection_list.html index 25d020c1..6eac7cf5 100644 --- a/journal/templates/user_collection_list.html +++ b/journal/templates/user_collection_list.html @@ -9,7 +9,7 @@ {% load user_actions %} {% load thumb %} - + diff --git a/journal/templates/user_item_list_base.html b/journal/templates/user_item_list_base.html index 7196d9d1..cf68db35 100644 --- a/journal/templates/user_item_list_base.html +++ b/journal/templates/user_item_list_base.html @@ -7,7 +7,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/journal/templates/user_tag_list.html b/journal/templates/user_tag_list.html index 2683efc4..4f66e12f 100644 --- a/journal/templates/user_tag_list.html +++ b/journal/templates/user_tag_list.html @@ -9,7 +9,7 @@ {% load highlight %} {% load thumb %} - + diff --git a/management/templates/management/create_update.html b/management/templates/management/create_update.html index c37b1677..55a4e97e 100644 --- a/management/templates/management/create_update.html +++ b/management/templates/management/create_update.html @@ -1,6 +1,6 @@ {% load static %} - + diff --git a/management/templates/management/delete.html b/management/templates/management/delete.html index a0dc2a25..006c35aa 100644 --- a/management/templates/management/delete.html +++ b/management/templates/management/delete.html @@ -1,6 +1,6 @@ {% load static %} - + diff --git a/management/templates/management/detail.html b/management/templates/management/detail.html index c853da0f..712feb42 100644 --- a/management/templates/management/detail.html +++ b/management/templates/management/detail.html @@ -1,7 +1,7 @@ {% load static %} {% load i18n %} - + diff --git a/management/templates/management/list.html b/management/templates/management/list.html index 4e7d0c90..f0fe06ab 100644 --- a/management/templates/management/list.html +++ b/management/templates/management/list.html @@ -1,7 +1,7 @@ {% load static %} {% load i18n %} - + diff --git a/social/templates/feed.html b/social/templates/feed.html index 501ff4ed..e2bd09d4 100644 --- a/social/templates/feed.html +++ b/social/templates/feed.html @@ -7,7 +7,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/users/templates/users/data.html b/users/templates/users/data.html index fd8d8a39..eb1b4638 100644 --- a/users/templates/users/data.html +++ b/users/templates/users/data.html @@ -6,7 +6,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/users/templates/users/home_anonymous.html b/users/templates/users/home_anonymous.html index 83ea71e5..bc34c789 100644 --- a/users/templates/users/home_anonymous.html +++ b/users/templates/users/home_anonymous.html @@ -1,7 +1,7 @@ {% load static %} {% load i18n %} - + diff --git a/users/templates/users/login.html b/users/templates/users/login.html index c4fd21a5..651af5d3 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,7 +1,7 @@ {% load i18n %} {% load static %} - + diff --git a/users/templates/users/manage_report.html b/users/templates/users/manage_report.html index 3f6f868b..6ff90d7f 100644 --- a/users/templates/users/manage_report.html +++ b/users/templates/users/manage_report.html @@ -5,7 +5,7 @@ {% load oauth_token %} {% load truncate %} - + diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html index 2dfb69ce..3797cb07 100644 --- a/users/templates/users/preferences.html +++ b/users/templates/users/preferences.html @@ -6,7 +6,7 @@ {% load truncate %} {% load thumb %} - + diff --git a/users/templates/users/register.html b/users/templates/users/register.html index 235a906f..9421a61f 100644 --- a/users/templates/users/register.html +++ b/users/templates/users/register.html @@ -1,11 +1,11 @@ {% load i18n %} {% load static %} - + - {{ site_name }} - {% trans '注册' %} + {{ site_name }} - {% trans '注册完成' %} {% include "common_libs.html" with jquery=0 v2=1 %} @@ -18,7 +18,7 @@ {{ site_name }}还在不断完善中，丰富的内容需要大家共同创造。 试图添加垃圾数据（如添加信息混乱或缺失的书籍、以推广为主要目的的评论）将会受到严肃处理。 {{ site_name }}继承了联邦宇宙的用户关系，比如您在联邦宇宙屏蔽了某人，那您将不会在书影音的公共区域看到TA的痕迹。 - 本站为非盈利站点，cookie和其它数据保管使用原则请参阅站内公告。 + 本站为非盈利站点，cookie和其它数据保管使用原则请参阅站内公告。

此外，{{ site_name }}现处于测试阶段，疏漏在所难免，请妥善备份您的数据。 diff --git a/users/templates/users/relation_list.html b/users/templates/users/relation_list.html index 535a29b8..e714f99d 100644 --- a/users/templates/users/relation_list.html +++ b/users/templates/users/relation_list.html @@ -5,7 +5,7 @@ {% load oauth_token %} {% load highlight %} - + diff --git a/users/templates/users/report.html b/users/templates/users/report.html index 892c0c05..46344a84 100644 --- a/users/templates/users/report.html +++ b/users/templates/users/report.html @@ -5,7 +5,7 @@ {% load oauth_token %} {% load truncate %} - +