From e23e7e58acedcb2f5b722418f06e60d57dcb3d07 Mon Sep 17 00:00:00 2001 From: yangjian Date: Wed, 2 Dec 2020 21:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E8=BF=87=E6=BB=A4=E5=99=A8=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/403.html | 8 +-- template/404.html | 5 +- template/app_admin/admin_base.html | 1 + template/app_admin/admin_center.html | 1 + template/app_admin/admin_doc.html | 1 + template/app_admin/admin_doctemp.html | 1 + template/app_admin/admin_overview.html | 1 + template/app_admin/admin_project.html | 1 + template/app_admin/admin_project_role.html | 1 + template/app_admin/admin_register_code.html | 1 + template/app_admin/admin_setting.html | 1 + template/app_admin/admin_user.html | 1 + template/app_api/manage_token.html | 1 + template/app_api/single_doc_detail.html | 1 + template/app_doc/check_viewcode.html | 1 + template/app_doc/diff_doc.html | 1 + template/app_doc/doc.html | 1 + template/app_doc/docs_base.html | 1 + template/app_doc/editor/create_base_2.html | 1 + .../app_doc/editor/create_base_vditor.html | 21 ++++++- template/app_doc/editor/create_doc.html | 1 + .../app_doc/editor/create_doc_vditor.html | 38 ++++++++++++ template/app_doc/editor/create_doctemp.html | 1 + .../app_doc/editor/create_doctemp_vditor.html | 1 + template/app_doc/editor/modify_doc.html | 1 + .../app_doc/editor/modify_doc_vditor.html | 1 + template/app_doc/editor/modify_doctemp.html | 1 + .../app_doc/editor/modify_doctemp_vditor.html | 1 + template/app_doc/head_base.html | 1 + .../app_doc/manage/manage_attachment.html | 1 + template/app_doc/manage/manage_doc.html | 1 + .../app_doc/manage/manage_doc_history.html | 1 + .../app_doc/manage/manage_doc_recycle.html | 1 + template/app_doc/manage/manage_doc_share.html | 1 + template/app_doc/manage/manage_doc_tag.html | 1 + template/app_doc/manage/manage_doctemp.html | 1 + template/app_doc/manage/manage_image.html | 1 + .../app_doc/manage/manage_image_group.html | 1 + template/app_doc/manage/manage_overview.html | 3 +- template/app_doc/manage/manage_project.html | 1 + .../manage/manage_project_collaborator.html | 1 + .../manage/manage_project_doc_sort.html | 1 + .../app_doc/manage/manage_project_import.html | 1 + .../manage/manage_project_options.html | 1 + .../manage/manage_project_self_colla.html | 1 + .../manage/manage_project_transfer.html | 1 + template/app_doc/manage/manage_self.html | 1 + template/app_doc/pro_list.html | 1 + template/app_doc/project.html | 23 ++++---- template/app_doc/project_doc_search.html | 7 ++- template/app_doc/search.html | 6 +- template/app_doc/search_result.html | 59 ++++++++++--------- template/app_doc/share/share_check.html | 1 + template/app_doc/share/share_doc.html | 1 + template/app_doc/tag_doc_base.html | 15 ++--- template/app_doc/tag_doc_single.html | 29 ++++----- template/app_doc/tag_docs.html | 7 ++- template/app_doc/user/user_base.html | 1 + template/app_doc/user/user_center.html | 1 + template/forget_pwd.html | 12 ++-- template/login.html | 18 +++--- template/register.html | 10 ++-- template/search/search.html | 59 ++++++++++--------- 63 files changed, 237 insertions(+), 130 deletions(-) diff --git a/template/403.html b/template/403.html index 359681d..086d568 100644 --- a/template/403.html +++ b/template/403.html @@ -1,9 +1,10 @@ {% load static %} +{% load i18n %} - 拒绝访问 - {% if site_name != None %}{{site_name}} {% else %}觅道文档MrDoc{% endif %} + {% trans "拒绝访问" %} - {% if site_name != None %}{{site_name}} {% else %}{% trans "觅道文档MrDoc" %}{% endif %} @@ -16,10 +17,9 @@

- 你无权访问当前页面…… + {% trans "你无权访问当前页面……" %}

- -

返回首页

+

{% trans "返回首页" %}

diff --git a/template/404.html b/template/404.html index 08aecd1..81279f9 100644 --- a/template/404.html +++ b/template/404.html @@ -1,9 +1,10 @@ {% load static %} +{% load i18n %} - 404 页面未找到 - {% if site_name != None %}{{site_name}} {% else %}觅道文档MrDoc{% endif %} + {% trans "页面未找到" %} - {% if site_name != None %}{{site_name}} {% else %}{% trans "觅道文档MrDoc" %}{% endif %} @@ -15,7 +16,7 @@
-

返回首页

+

{% trans "返回首页" %}

diff --git a/template/app_admin/admin_base.html b/template/app_admin/admin_base.html index a672325..cf68dff 100644 --- a/template/app_admin/admin_base.html +++ b/template/app_admin/admin_base.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_admin/admin_center.html b/template/app_admin/admin_center.html index e86a0c7..d2936d5 100644 --- a/template/app_admin/admin_center.html +++ b/template/app_admin/admin_center.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_admin/admin_doc.html b/template/app_admin/admin_doc.html index 383bc7f..3bec652 100644 --- a/template/app_admin/admin_doc.html +++ b/template/app_admin/admin_doc.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档管理{% endblock %} {% block content %}
diff --git a/template/app_admin/admin_doctemp.html b/template/app_admin/admin_doctemp.html index 326230b..401d399 100644 --- a/template/app_admin/admin_doctemp.html +++ b/template/app_admin/admin_doctemp.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档模板管理{% endblock %} {% block content %}
diff --git a/template/app_admin/admin_overview.html b/template/app_admin/admin_overview.html index 2227750..ee32d5b 100644 --- a/template/app_admin/admin_overview.html +++ b/template/app_admin/admin_overview.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}仪表盘{% endblock %} {% block custom_element %} diff --git a/template/app_admin/admin_project.html b/template/app_admin/admin_project.html index 144986e..cd28b1d 100644 --- a/template/app_admin/admin_project.html +++ b/template/app_admin/admin_project.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}文集管理{% endblock %} {% block content %}
diff --git a/template/app_admin/admin_project_role.html b/template/app_admin/admin_project_role.html index 7730982..87ca1d3 100644 --- a/template/app_admin/admin_project_role.html +++ b/template/app_admin/admin_project_role.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}文集权限管理{% endblock %} {% block custom_element %} diff --git a/template/app_admin/admin_register_code.html b/template/app_admin/admin_register_code.html index f806985..7150953 100644 --- a/template/app_admin/admin_register_code.html +++ b/template/app_admin/admin_register_code.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}注册码管理{% endblock %} {% block content %}
diff --git a/template/app_admin/admin_setting.html b/template/app_admin/admin_setting.html index 028ad6c..fc18b5d 100644 --- a/template/app_admin/admin_setting.html +++ b/template/app_admin/admin_setting.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}站点设置{% endblock %} {% block custom_element %} diff --git a/template/app_admin/admin_user.html b/template/app_admin/admin_user.html index 5ab6d57..6f4359a 100644 --- a/template/app_admin/admin_user.html +++ b/template/app_admin/admin_user.html @@ -1,5 +1,6 @@ {% extends 'app_admin/admin_base.html' %} {% load static %} +{% load i18n %} {% block title %}用户管理{% endblock %} {% block content %}
diff --git a/template/app_api/manage_token.html b/template/app_api/manage_token.html index 6c26286..c86744d 100644 --- a/template/app_api/manage_token.html +++ b/template/app_api/manage_token.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}用户Token管理{% endblock %} {% block content %}
diff --git a/template/app_api/single_doc_detail.html b/template/app_api/single_doc_detail.html index 8d241b2..fb5ac2f 100644 --- a/template/app_api/single_doc_detail.html +++ b/template/app_api/single_doc_detail.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/check_viewcode.html b/template/app_doc/check_viewcode.html index 20e57f4..780f335 100644 --- a/template/app_doc/check_viewcode.html +++ b/template/app_doc/check_viewcode.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/diff_doc.html b/template/app_doc/diff_doc.html index a4448c8..a865873 100644 --- a/template/app_doc/diff_doc.html +++ b/template/app_doc/diff_doc.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/doc.html b/template/app_doc/doc.html index 3badcff..e292dd8 100644 --- a/template/app_doc/doc.html +++ b/template/app_doc/doc.html @@ -2,6 +2,7 @@ {% extends 'app_doc/docs_base.html' %} {% load static %} +{% load i18n %} {% block keyword %}{{ doc.name }},{{ project.name }},{% endblock %} {% block description %}{{doc.pre_content | slice:"0:100"}}{% endblock %} diff --git a/template/app_doc/docs_base.html b/template/app_doc/docs_base.html index 33805c5..49ee2c7 100644 --- a/template/app_doc/docs_base.html +++ b/template/app_doc/docs_base.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/editor/create_base_2.html b/template/app_doc/editor/create_base_2.html index 45f481a..924f275 100644 --- a/template/app_doc/editor/create_base_2.html +++ b/template/app_doc/editor/create_base_2.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/editor/create_base_vditor.html b/template/app_doc/editor/create_base_vditor.html index f1b0fc1..6d84a82 100644 --- a/template/app_doc/editor/create_base_vditor.html +++ b/template/app_doc/editor/create_base_vditor.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} @@ -30,7 +31,7 @@
-
MrDoc文档编辑器
+
{% trans "MrDoc文档编辑器" %}
你正在：{% block editor_type %}{% endblock %}
@@ -672,4 +673,22 @@ return false }); + + + + \ No newline at end of file diff --git a/template/app_doc/editor/create_doc.html b/template/app_doc/editor/create_doc.html index 7a0ad1a..fa0d8e6 100644 --- a/template/app_doc/editor/create_doc.html +++ b/template/app_doc/editor/create_doc.html @@ -1,5 +1,6 @@ {% extends 'app_doc/editor/create_base_2.html' %} {% load static %} +{% load i18n %} {% block title %}新建文档 - Editormd编辑模式{% endblock %} {% block editor_type %}新建文档{% endblock %} diff --git a/template/app_doc/editor/create_doc_vditor.html b/template/app_doc/editor/create_doc_vditor.html index caed2a6..65e36b7 100644 --- a/template/app_doc/editor/create_doc_vditor.html +++ b/template/app_doc/editor/create_doc_vditor.html @@ -1,5 +1,6 @@ {% extends 'app_doc/editor/create_base_vditor.html' %} {% load static %} +{% load i18n %} {% block title %}新建文档 - Vditor编辑模式{% endblock %} {% block editor_type %}新建文档{% endblock %} @@ -24,6 +25,10 @@ 导入模板 + + diff --git a/template/app_doc/manage/manage_attachment.html b/template/app_doc/manage/manage_attachment.html index 83eb39d..8ae7ed3 100644 --- a/template/app_doc/manage/manage_attachment.html +++ b/template/app_doc/manage/manage_attachment.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}附件管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_doc.html b/template/app_doc/manage/manage_doc.html index 6f76092..2c365fa 100644 --- a/template/app_doc/manage/manage_doc.html +++ b/template/app_doc/manage/manage_doc.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_doc_history.html b/template/app_doc/manage/manage_doc_history.html index 8be4f71..308b6be 100644 --- a/template/app_doc/manage/manage_doc_history.html +++ b/template/app_doc/manage/manage_doc_history.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档历史版本管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_doc_recycle.html b/template/app_doc/manage/manage_doc_recycle.html index 2f11576..7ca6fb8 100644 --- a/template/app_doc/manage/manage_doc_recycle.html +++ b/template/app_doc/manage/manage_doc_recycle.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档回收站管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_doc_share.html b/template/app_doc/manage/manage_doc_share.html index 3f80a5c..3d2ec53 100644 --- a/template/app_doc/manage/manage_doc_share.html +++ b/template/app_doc/manage/manage_doc_share.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档分享管理{% endblock %} {% block content %} diff --git a/template/app_doc/manage/manage_doc_tag.html b/template/app_doc/manage/manage_doc_tag.html index 8656ebe..8d819d1 100644 --- a/template/app_doc/manage/manage_doc_tag.html +++ b/template/app_doc/manage/manage_doc_tag.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档标签管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_doctemp.html b/template/app_doc/manage/manage_doctemp.html index e8e5ec1..cb54f4d 100644 --- a/template/app_doc/manage/manage_doctemp.html +++ b/template/app_doc/manage/manage_doctemp.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文档模板管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_image.html b/template/app_doc/manage/manage_image.html index eafcc3c..784877c 100644 --- a/template/app_doc/manage/manage_image.html +++ b/template/app_doc/manage/manage_image.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}图片素材管理{% endblock %} {% block custom_element %} diff --git a/template/app_doc/manage/manage_image_group.html b/template/app_doc/manage/manage_image_group.html index ae19639..eb12986 100644 --- a/template/app_doc/manage/manage_image_group.html +++ b/template/app_doc/manage/manage_image_group.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}图片分组管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_overview.html b/template/app_doc/manage/manage_overview.html index 296803e..0c6c550 100644 --- a/template/app_doc/manage/manage_overview.html +++ b/template/app_doc/manage/manage_overview.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}仪表盘{% endblock %} {% block custom_element %} @@ -89,7 +90,7 @@ src="{% static 'PearAdminLayui/avatar.svg' %}">
{% if doc.status == 1 %} -

{{doc.create_user.first_name}} 发布了文档 {{doc.name}}

+

{{doc.create_user.first_name}} 修改了文档 {{doc.name}}

{% elif doc.status == 0 %}

{{doc.create_user.first_name}} 保存了文档 {{doc.name}}

{% else %} diff --git a/template/app_doc/manage/manage_project.html b/template/app_doc/manage/manage_project.html index b2d479d..48d18a9 100644 --- a/template/app_doc/manage/manage_project.html +++ b/template/app_doc/manage/manage_project.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文集管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_project_collaborator.html b/template/app_doc/manage/manage_project_collaborator.html index 5eb099a..6762978 100644 --- a/template/app_doc/manage/manage_project_collaborator.html +++ b/template/app_doc/manage/manage_project_collaborator.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文集协作管理{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_project_doc_sort.html b/template/app_doc/manage/manage_project_doc_sort.html index 3f3ad9a..26bcffe 100644 --- a/template/app_doc/manage/manage_project_doc_sort.html +++ b/template/app_doc/manage/manage_project_doc_sort.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文集文档排序{% endblock %} {% block custom_element %} diff --git a/template/app_doc/manage/manage_project_import.html b/template/app_doc/manage/manage_project_import.html index 78b5c5d..f3add2a 100644 --- a/template/app_doc/manage/manage_project_import.html +++ b/template/app_doc/manage/manage_project_import.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}导入文集{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_project_options.html b/template/app_doc/manage/manage_project_options.html index 6295769..443c7da 100644 --- a/template/app_doc/manage/manage_project_options.html +++ b/template/app_doc/manage/manage_project_options.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文集设置{% endblock %} {% block custom_element %} diff --git a/template/app_doc/manage/manage_project_self_colla.html b/template/app_doc/manage/manage_project_self_colla.html index 0435584..15ca7bd 100644 --- a/template/app_doc/manage/manage_project_self_colla.html +++ b/template/app_doc/manage/manage_project_self_colla.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}我协作的文集{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_project_transfer.html b/template/app_doc/manage/manage_project_transfer.html index b74c73f..8e5606e 100644 --- a/template/app_doc/manage/manage_project_transfer.html +++ b/template/app_doc/manage/manage_project_transfer.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}文集设置{% endblock %} {% block content %}
diff --git a/template/app_doc/manage/manage_self.html b/template/app_doc/manage/manage_self.html index e0d0812..7fa3813 100644 --- a/template/app_doc/manage/manage_self.html +++ b/template/app_doc/manage/manage_self.html @@ -1,5 +1,6 @@ {% extends 'app_doc/user/user_base.html' %} {% load static %} +{% load i18n %} {% block title %}个人设置{% endblock %} {% block content %}
diff --git a/template/app_doc/pro_list.html b/template/app_doc/pro_list.html index 42c2663..c8f76a6 100644 --- a/template/app_doc/pro_list.html +++ b/template/app_doc/pro_list.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/project.html b/template/app_doc/project.html index c767e86..d0fee12 100644 --- a/template/app_doc/project.html +++ b/template/app_doc/project.html @@ -2,6 +2,7 @@ {% extends 'app_doc/docs_base.html' %} {% load static %} +{% load i18n %} {% block title %}{{ project.name }}{% endblock %} @@ -9,12 +10,12 @@ {% if request.user == project.create_user or colla_user > 0 %} | - 添加 + {% trans "添加" %} {% endif %} {% if request.user == project.create_user %} - 管理 + {% trans "管理" %} {% endif %} {% endblock %} @@ -22,8 +23,8 @@ {% block content_head %}

{{ project.name }}

- 创建人：{% if project.create_user.first_name != '' %} {{project.create_user.first_name}} {% else %} {{project.create_user}}{% endif %} -      创建于：{{ project.create_time }} + {% trans "创建人：" %}{% if project.create_user.first_name != '' %} {{project.create_user.first_name}} {% else %} {{project.create_user}}{% endif %} +      {% trans "创建于：" %}{{ project.create_time }}

{% endblock %} @@ -32,11 +33,11 @@ {% load doc_filter %}
    -
  • 简介
    • -
  • 目录大纲
    • -
  • 最新文档
    • +
  • {% trans "简介" %}
    • +
  • {% trans "目录大纲" %}
    • +
  • {% trans "最新文档" %}
    • {% if enable_project_report %} -
  • 文集下载
    • +
  • {% trans "文集下载" %}
    • {% endif %}
@@ -78,10 +79,10 @@ PDF电子书 {% endif %} {% if allow_download.allow_pdf == 0 and allow_download.allow_epub == 0 %} - 文集作者未开放此文集的任何格式下载！ + {% trans "文集作者未开放此文集的任何格式下载！" %} {% endif %} {% else %} - 文集作者未开放此文集的任何格式下载！ + {% trans "文集作者未开放此文集的任何格式下载！" %} {% endif %}

@@ -130,7 +131,7 @@ {% block doc_bottom_block %} {% endblock %} diff --git a/template/app_doc/project_doc_search.html b/template/app_doc/project_doc_search.html index 468728d..6b87f7f 100644 --- a/template/app_doc/project_doc_search.html +++ b/template/app_doc/project_doc_search.html @@ -2,19 +2,20 @@ {% extends 'app_doc/docs_base.html' %} {% load static %} +{% load i18n %} -{% block title %}搜索“{{kw}}”的结果 - {{ project.name }}{% endblock %} +{% block title %}{% trans "搜索" %} {{kw}} {% trans "的结果" %} - {{ project.name }}{% endblock %} {% block head_toolbar %} {% if request.user == project.create_user %} - 添加文档 + {% trans "添加文档" %} {% endif %} {% endblock %} {% block content_head %} -

搜索“{{kw}}”共有{{ search_result.count }}个结果 - {{project.name}}

+

{% trans "搜索" %} {{kw}} {% trans "共有" %}{{ search_result.count }}{% trans "个结果" %} - {{project.name}}

{% endblock %} {% block page_content %} diff --git a/template/app_doc/search.html b/template/app_doc/search.html index f3d52b1..0edb936 100644 --- a/template/app_doc/search.html +++ b/template/app_doc/search.html @@ -1,7 +1,7 @@ {% load static %} +{% load i18n %} - @@ -22,7 +22,7 @@ - 觅道搜索{% if site_name != None and site_name != '' %} - {{site_name}}{% endif %} + {% trans "觅道搜索" %}{% if site_name != None and site_name != '' %} - {{site_name}}{% endif %} @@ -39,7 +39,7 @@
diff --git a/template/app_doc/search_result.html b/template/app_doc/search_result.html index 5336d0a..95dbe27 100644 --- a/template/app_doc/search_result.html +++ b/template/app_doc/search_result.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} @@ -10,7 +11,7 @@ - {{ kw }} - 觅道搜索 - {% if site_name != None and site_name != '' %}{{ site_name }}{% endif %} + {{ kw }} - {% trans "觅道搜索" %} - {% if site_name != None and site_name != '' %}{{ site_name }}{% endif %} @@ -57,7 +58,7 @@
- 返回首页 + {% trans "返回首页" %}
{% endif %} @@ -69,19 +70,19 @@
- 个人中心 + {% trans "个人中心" %}
- 修改密码 + {% trans "修改密码" %}
- 退出登录 + {% trans "退出登录" %}
@@ -89,15 +90,15 @@ {% else %}
  • - 游客 + {% trans "游客" %}
    {% if close_register == 'on' %} -
    登录
    +
    {% trans "登录" %}
    {% else %} -
    注册
    -
    登录
    +
    {% trans "注册" %}
    +
    {% trans "登录" %}
    {% endif %}
    • @@ -139,20 +140,20 @@
    - 文档 - 文集 - 标签 + {% trans "文档" %} + {% trans "文集" %} + {% trans "标签" %}
    @@ -164,19 +165,19 @@ {% if kw != '' %}
    - 觅道文档在 + {% trans "觅道文档在" %} {% if date_range == 'recent1' %} - 近1天内 + {% trans "近1天内" %} {% elif date_range == 'recent7' %} - 近7天内 + {% trans "近7天内" %} {% elif date_range == 'recent30' %} - 近30天内 + {% trans "近30天内" %} {% elif date_range == 'recent365' %} - 近一年内 + {% trans "近一年内" %} {% else %} - 全部时间内 + {% trans "全部时间内" %} {% endif %} - 搜索到 {{ data_list.count }} 条结果 + {% trans "搜索到" %} {{ data_list.count }} {% trans "条结果" %}
    {% endif %} @@ -242,9 +243,9 @@
    {% if datas.has_previous %} - 上一页 + {% trans "上一页" %} {% else %} - 上一页 + {% trans "上一页" %} {% endif %} @@ -253,9 +254,9 @@ {% if datas.has_next %} - 下一页 + {% trans "下一页" %} {% else %} - 下一页 + {% trans "下一页" %} {% endif %}
    diff --git a/template/app_doc/share/share_check.html b/template/app_doc/share/share_check.html index 3b05792..3a574a1 100644 --- a/template/app_doc/share/share_check.html +++ b/template/app_doc/share/share_check.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/share/share_doc.html b/template/app_doc/share/share_doc.html index ef83529..ed46b4b 100644 --- a/template/app_doc/share/share_doc.html +++ b/template/app_doc/share/share_doc.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/tag_doc_base.html b/template/app_doc/tag_doc_base.html index ea48d99..92b2f49 100644 --- a/template/app_doc/tag_doc_base.html +++ b/template/app_doc/tag_doc_base.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} @@ -11,7 +12,7 @@ - {% block title %}标签：{{tag.name}}{% endblock %} - {% if site_name != None and site_name != '' %}{{ site_name }}{% else %}站点标题{% endif %} + {% block title %}{% trans "标签：" %}{{tag.name}}{% endblock %} - {% if site_name != None and site_name != '' %}{{ site_name }}{% else %}{% trans "站点标题" %}{% endif %} @@ -40,10 +41,6 @@ .doc-content ul ul ul li{ list-style-type: square; } - /* 下拉目录隐藏li样式 */ - .editormd-toc-menu ul.markdown-toc-list li{ - /*list-style:none;*/ - } /* 弹出框文档目录样式 */ ul.markdown-toc-list{ list-style-position:inside; @@ -124,7 +121,7 @@
    - 标签：{{ tag.name }} + {% trans "标签：" %}{{ tag.name }} {% if project.role == 1 %} {% endif %} @@ -145,7 +142,7 @@
    - 本文档使用MrDoc发布 + {% trans "本文档使用MrDoc发布" %}
    @@ -182,7 +179,7 @@ {% endblock %} - 首页 + {% trans "首页" %}
    @@ -194,7 +191,7 @@
    {% block content_head %} -

    标签：{{ tag.name }}

    +

    {% trans "标签：" %}{{ tag.name }}

    {% endblock %} diff --git a/template/app_doc/tag_doc_single.html b/template/app_doc/tag_doc_single.html index b3f8506..ff68024 100644 --- a/template/app_doc/tag_doc_single.html +++ b/template/app_doc/tag_doc_single.html @@ -2,32 +2,33 @@ {% extends 'app_doc/tag_doc_base.html' %} {% load static %} +{% load i18n %} {% block keyword %}{{ doc.name }},{{ project.name }},{% endblock %} {% block description %}{{doc.pre_content | slice:"0:100"}}{% endblock %} -{% block title %}{{ doc.name }} - 标签：{{ tag.name }}{% endblock %} +{% block title %}{{ doc.name }} - {% trans "标签：" %}{{ tag.name }}{% endblock %} {% block head_toolbar %} {% if request.user == doc.create_user or request.user == project.create_user %} | - 修改 + {% trans "修改" %} - 添加 + {% trans "添加" %} - 管理 + {% trans "管理" %} {% elif colla_user > 0 %} | {% if colla_user_role == 1 %} - 修改 + {% trans "修改" %} {% endif %} - 添加 + {% trans "添加" %} {% endif %} @@ -68,12 +69,12 @@ {% if request.user == doc.create_user or request.user.is_superuser %} {% endif %}
    @@ -87,23 +88,23 @@
    {% if doc.id|get_doc_previous == None %} - + {% else %} - 上一篇 + {% trans "上一篇" %} {% endif %}
    {% if doc.id|get_doc_next == None %} - + {% else %} - 下一篇 + {% trans "下一篇" %} {% endif %}
    {% endblock %} {% block right_widget %} - + {% endblock %} {% block custom_script %} @@ -111,7 +112,7 @@ diff --git a/template/app_doc/tag_docs.html b/template/app_doc/tag_docs.html index f6e768d..56d1221 100644 --- a/template/app_doc/tag_docs.html +++ b/template/app_doc/tag_docs.html @@ -2,12 +2,13 @@ {% extends 'app_doc/tag_doc_base.html' %} {% load static %} +{% load i18n %} {% block keyword %}{{ tag.name }},{% endblock %} -{% block title %}标签：{{ tag.name }}{% endblock %} +{% block title %}{% trans "标签：" %}{{ tag.name }}{% endblock %} {% block content_head %} -

    标签：{{ tag.name }}

    +

    {% trans "标签：" %}{{ tag.name }}

    {% endblock %} {% block page_content %} @@ -21,7 +22,7 @@
    diff --git a/template/app_doc/user/user_base.html b/template/app_doc/user/user_base.html index 8115fbb..3ae01a1 100644 --- a/template/app_doc/user/user_base.html +++ b/template/app_doc/user/user_base.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/app_doc/user/user_center.html b/template/app_doc/user/user_center.html index 716e4d7..a31920c 100644 --- a/template/app_doc/user/user_center.html +++ b/template/app_doc/user/user_center.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} diff --git a/template/forget_pwd.html b/template/forget_pwd.html index 332ee19..2290281 100644 --- a/template/forget_pwd.html +++ b/template/forget_pwd.html @@ -1,8 +1,9 @@ {% load static %} +{% load i18n %} - 忘记密码 - {% if site_name != None %}{{site_name}} {% else %}觅道文档MrDoc{% endif %} + {% trans "忘记密码" %} - {% if site_name != None %}{{site_name}} {% else %}{% trans "觅道文档MrDoc" %}{% endif %} @@ -20,7 +21,6 @@ } .login-form{ margin-top: 15%; - {#width: 400px;#} padding: 20px 50px 20px 60px; background-color: #fff; -webkit-box-shadow: #666 0px 0px 10px; @@ -40,14 +40,14 @@
    {% csrf_token %}
    -

    忘记密码 - MrDoc

    +

    {% trans "忘记密码" %} - {% trans "觅道文档" %}

    {{ errormsg }}
    - +
    @@ -59,9 +59,9 @@
    - +
    - 返回登录  + {% trans "返回登录" %} 
    diff --git a/template/login.html b/template/login.html index 951303f..d03c3aa 100644 --- a/template/login.html +++ b/template/login.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} @@ -8,7 +9,7 @@ - 用户登录 - {% if site_name != None %}{{site_name}} {% else %}觅道文档MrDoc{% endif %} + {% trans "用户登录" %} - {% if site_name != None %}{{site_name}} {% else %}{% trans "觅道文档MrDoc" %}{% endif %} @@ -26,7 +27,6 @@ } .login-form{ margin-top: 15%; - {#width: 400px;#} padding: 20px 50px 20px 60px; background-color: #fff; -webkit-box-shadow: #666 0px 0px 10px; @@ -59,7 +59,7 @@
    {% csrf_token %}
    -

    登录 - {% if site_name != None %}{{site_name}} {% else %}觅道文档{% endif %}

    +

    {% trans "登录" %} - {% if site_name != None %}{{site_name}} {% else %}{% trans "觅道文档" %}{% endif %}

    {{ errormsg }}
    @@ -74,20 +74,18 @@
    {% if close_register == 'on' %} - 本站暂不开放注册 + {% trans "本站暂不开放注册" %} {% else %} - 注册账号  + {% trans "注册账号" %}  {% endif %} - {% if enable_email == 'on' %} - 忘记密码 + {% trans "忘记密码" %} {% endif %} - - 返回首页 + {% trans "返回首页" %}
    diff --git a/template/register.html b/template/register.html index adbb63a..d02ad46 100644 --- a/template/register.html +++ b/template/register.html @@ -1,8 +1,9 @@ {% load static %} +{% load i18n %} - 用户注册 - {% if site_name != None %}{{site_name}} {% else %}觅道文档MrDoc{% endif %} + {% trans "用户注册" %} - {% if site_name != None %}{{site_name}} {% else %}{% trans "觅道文档MrDoc" %}{% endif %} @@ -20,7 +21,6 @@ } .login-form{ margin-top: 15%; - {#width: 400px;#} padding: 20px 50px 20px 60px; background-color: #fff; -webkit-box-shadow: #666 0px 0px 10px; @@ -53,7 +53,7 @@
    {% csrf_token %}
    -

    注册 - {% if site_name != None %}{{site_name}} {% else %}觅道文档{% endif %}

    +

    {% trans "注册" %} - {% if site_name != None %}{{site_name}} {% else %}{% trans "觅道文档" %}{% endif %}

    {{ errormsg }} {% if enable_register_code %} @@ -95,8 +95,8 @@
    - 返回登录 - 返回首页 + {% trans "返回登录" %} + {% trans "返回首页" %}
    diff --git a/template/search/search.html b/template/search/search.html index d1d0de7..fe294f8 100644 --- a/template/search/search.html +++ b/template/search/search.html @@ -1,4 +1,5 @@ {% load static %} +{% load i18n %} @@ -10,7 +11,7 @@ - {{ query }} - 觅道搜索 - {% if site_name != None and site_name != '' %}{{ site_name }}{% endif %} + {{ query }} - {% trans "觅道搜索" %} - {% if site_name != None and site_name != '' %}{{ site_name }}{% endif %} @@ -57,7 +58,7 @@
    - 返回首页 + {% trans "返回首页" %}
    {% endif %} @@ -69,13 +70,13 @@
    - 个人中心 + {% trans "个人中心" %}
    - 退出登录 + {% trans "退出登录" %}
    @@ -83,15 +84,15 @@ {% else %}
  • - 游客 + {% trans "游客" %}
    {% if close_register == 'on' %} -
    登录
    +
    {% trans "登录" %}
    {% else %} -
    注册
    -
    登录
    +
    {% trans "注册" %}
    +
    {% trans "登录" %}
    {% endif %}
    • @@ -133,20 +134,20 @@
    - 文档 - 文集 - 标签 + {% trans "文档" %} + {% trans "文集" %} + {% trans "标签" %}
    @@ -158,19 +159,19 @@ {% if query != '' %}
    - 觅道文档在 + {% trans "觅道文档在" %} {% if date_range == 'recent1' %} - 近1天内 + {% trans "近1天内" %} {% elif date_range == 'recent7' %} - 近7天内 + {% trans "近7天内" %} {% elif date_range == 'recent30' %} - 近30天内 + {% trans "近30天内" %} {% elif date_range == 'recent365' %} - 近一年内 + {% trans "近一年内" %} {% else %} - 全部时间内 + {% trans "全部时间内" %} {% endif %} - 搜索到 {{ page.paginator.count }} 条结果 + {% trans "搜索到" %} {{ page.paginator.count }} {% trans "条结果" %}
    {% endif %} @@ -193,7 +194,7 @@ {{ result.object.top_doc | get_doc_top }} - {{result.object.modify_time}}

    {% empty %} -

    没有搜索结果。

    +

    {% trans "没有搜索结果。" %}

    {% endfor %} {% else %} {# Show some example queries to run, maybe query syntax, something else? #} @@ -207,9 +208,9 @@
    {% if page.has_previous %} - 上一页 + {% trans "上一页" %} {% else %} - 上一页 + {% trans "上一页" %} {% endif %} @@ -218,9 +219,9 @@ {% if page.has_next %} - 下一页 + {% trans "下一页" %} {% else %} - 下一页 + {% trans "下一页" %} {% endif %}