diff --git a/boofilsic/settings.py b/boofilsic/settings.py index 733998cb..7f4145e3 100644 --- a/boofilsic/settings.py +++ b/boofilsic/settings.py @@ -366,6 +366,8 @@ AUTHENTICATION_BACKENDS = [ "oauth2_provider.backends.OAuth2Backend", ] +LOG_LEVEL = env("NEODB_LOG_LEVEL", default="DEBUG" if DEBUG else "INFO") # type:ignore + LOGGING = { "version": 1, "disable_existing_loggers": False, @@ -375,7 +377,7 @@ LOGGING = { "loggers": { "": { "handlers": ["console"], - "level": env("NEODB_LOG_LEVEL", default="DEBUG" if DEBUG else "INFO"), # type: ignore + "level": LOG_LEVEL, }, }, } diff --git a/catalog/templates/_sidebar_edit.html b/catalog/templates/_sidebar_edit.html index 79eec177..624fe307 100644 --- a/catalog/templates/_sidebar_edit.html +++ b/catalog/templates/_sidebar_edit.html @@ -4,40 +4,41 @@ {% if item %}
-- 条目已被删除 + {% trans "Item has been deleted." %}
{% endif %} {% if item.child_items %}- 条目下已有子项 + {% trans "Item contains sub-items." %}
{% endif %} {% if item.merged_to_item %}- 条目已被合并到其他条目 + {% trans "Item has been merged to another item." %}
{% endif %} {% if item.journal_exists %}- 条目已被用户标记过 + {% trans "Item has been marked by users." %}
{% endif %} {% for i in item.merged_from_items.all %} {% if forloop.first %} - 以下条目被并入本条目: + {% trans "The following items are merged into this item" %}- 条目已被删除 + {% trans "Item has been deleted." %}
{% endif %} {% if item.child_items %}- 条目下已有子项 + {% trans "Item contains sub-items." %}
{% endif %} {% if item.merged_to_item %}- 条目已被合并到其他条目 + {% trans "Item has been merged to another item." %}
{% endif %} {% if item.journal_exists %}- 条目已被用户标记过 + {% trans "Item has been marked by users." %}
{% endif %}