diff --git a/.gitignore b/.gitignore index 6033f725..c86f4f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ MANIFEST docs/_build .coverage *.sqlite3 +.idea/ diff --git a/reversion/apps.py b/reversion/apps.py index 464b2231..04c88128 100644 --- a/reversion/apps.py +++ b/reversion/apps.py @@ -1,6 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ class ReversionConfig(AppConfig): name = 'reversion' + verbose_name = _('Reversion') default_auto_field = 'django.db.models.AutoField' diff --git a/reversion/locale/zh_CN/LC_MESSAGES/django.mo b/reversion/locale/zh_CN/LC_MESSAGES/django.mo deleted file mode 100644 index 10d674ba..00000000 Binary files a/reversion/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ diff --git a/reversion/locale/zh_CN/LC_MESSAGES/django.po b/reversion/locale/zh_CN/LC_MESSAGES/django.po deleted file mode 100644 index 75e72312..00000000 --- a/reversion/locale/zh_CN/LC_MESSAGES/django.po +++ /dev/null @@ -1,121 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-12 14:21+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: admin.py:160 -msgid "Initial version." -msgstr "初始版本" - -#: admin.py:194 templates/reversion/change_list.html:7 -#: templates/reversion/recover_form.html:11 -#: templates/reversion/recover_list.html:11 -#, python-format -msgid "Recover deleted %(name)s" -msgstr "恢复已删除的 %(name)s" - -#: admin.py:311 -#, python-format -msgid "Reverted to previous version, saved on %(datetime)s" -msgstr "恢复到 %(datetime)s 的版本" - -#: admin.py:313 -#, python-format -msgid "" -"The %(model)s \"%(name)s\" was reverted successfully. You may edit it again " -"below." -msgstr "%(model)s \"%(name)s\" 已成功恢复,你可以在下面在此编辑它。" - -#: admin.py:398 -#, python-format -msgid "Recover %(name)s" -msgstr "恢复 %(name)s" - -#: admin.py:412 -#, python-format -msgid "Revert %(name)s" -msgstr "恢复 %(name)s" - -#: models.py:55 -msgid "date created" -msgstr "创建日期" - -#: models.py:62 -msgid "user" -msgstr "用户" - -#: models.py:66 -msgid "comment" -msgstr "评论" - -#: templates/reversion/object_history.html:8 -msgid "" -"Choose a date from the list below to revert to a previous version of this " -"object." -msgstr "单击下方的日期以恢复当前对象到之前的版本。" - -#: templates/reversion/object_history.html:15 -#: templates/reversion/recover_list.html:24 -msgid "Date/time" -msgstr "时间" - -#: templates/reversion/object_history.html:16 -msgid "User" -msgstr "用户" - -#: templates/reversion/object_history.html:17 -msgid "Comment" -msgstr "评论" - -#: templates/reversion/object_history.html:38 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "此对象不存在任何变更历史,它可能不是通过管理站点添加的。" - -#: templates/reversion/recover_form.html:8 -#: templates/reversion/recover_list.html:8 -#: templates/reversion/revision_form.html:8 -msgid "Home" -msgstr "首页" - -#: templates/reversion/recover_form.html:18 -msgid "Press the save button below to recover this version of the object." -msgstr "单击保存按钮以恢复为此版本。" - -#: templates/reversion/recover_list.html:18 -msgid "" -"Choose a date from the list below to recover a deleted version of an object." -msgstr "单击下方的日期以恢复一个已删除的对象。" - -#: templates/reversion/recover_list.html:38 -msgid "There are no deleted objects to recover." -msgstr "没有可供恢复的已删除对象。" - -#: templates/reversion/revision_form.html:12 -msgid "History" -msgstr "历史" - -#: templates/reversion/revision_form.html:13 -#, python-format -msgid "Revert %(verbose_name)s" -msgstr "恢复 %(verbose_name)s" - -#: templates/reversion/revision_form.html:26 -msgid "Press the save button below to revert to this version of the object." -msgstr "单击保存按钮将此对象恢复到此版本。" diff --git a/reversion/locale/zh_Hans/LC_MESSAGES/django.mo b/reversion/locale/zh_Hans/LC_MESSAGES/django.mo index 10d674ba..490a373c 100644 Binary files a/reversion/locale/zh_Hans/LC_MESSAGES/django.mo and b/reversion/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/reversion/locale/zh_Hans/LC_MESSAGES/django.po b/reversion/locale/zh_Hans/LC_MESSAGES/django.po index 75e72312..b70ee59b 100644 --- a/reversion/locale/zh_Hans/LC_MESSAGES/django.po +++ b/reversion/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-12 14:21+0800\n" +"POT-Creation-Date: 2024-01-25 16:26+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,104 +18,138 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: admin.py:160 +#: .\admin.py:70 msgid "Initial version." msgstr "初始版本" -#: admin.py:194 templates/reversion/change_list.html:7 -#: templates/reversion/recover_form.html:11 -#: templates/reversion/recover_list.html:11 -#, python-format -msgid "Recover deleted %(name)s" -msgstr "恢复已删除的 %(name)s" - -#: admin.py:311 +#: .\admin.py:178 #, python-format msgid "Reverted to previous version, saved on %(datetime)s" msgstr "恢复到 %(datetime)s 的版本" -#: admin.py:313 +#: .\admin.py:186 #, python-format -msgid "" -"The %(model)s \"%(name)s\" was reverted successfully. You may edit it again " -"below." -msgstr "%(model)s \"%(name)s\" 已成功恢复,你可以在下面在此编辑它。" +msgid "Could not load %(object_repr)s version - not found" +msgstr "无法载入 %(object_repr)s 版本 - 未找到" -#: admin.py:398 +#: .\admin.py:206 #, python-format msgid "Recover %(name)s" msgstr "恢复 %(name)s" -#: admin.py:412 +#: .\admin.py:222 #, python-format msgid "Revert %(name)s" msgstr "恢复 %(name)s" -#: models.py:55 +#: .\admin.py:259 .\templates\reversion\change_list.html:7 +#: .\templates\reversion\recover_form.html:10 +#: .\templates\reversion\recover_list.html:10 +#, python-format +msgid "Recover deleted %(name)s" +msgstr "恢复已删除的 %(name)s" + +#: .\apps.py:7 +msgid "Reversion" +msgstr "版本记录" + +#: .\models.py:39 +#, python-format +msgid "Could not save %(object_repr)s version - missing dependency." +msgstr "无法保存 %(object_repr)s 版本 - 缺少依赖" + +#: .\models.py:52 msgid "date created" msgstr "创建日期" -#: models.py:62 +#: .\models.py:61 msgid "user" msgstr "用户" -#: models.py:66 +#: .\models.py:67 msgid "comment" msgstr "评论" -#: templates/reversion/object_history.html:8 +#: .\models.py:116 +msgid "revision" +msgstr "修改" + +#: .\models.py:117 +msgid "revisions" +msgstr "修改" + +#: .\models.py:275 +#, python-format +msgid "Could not load %(object_repr)s version - incompatible version data." +msgstr "无法载入 %(object_repr)s 版本 - 不兼容的版本数据。" + +#: .\models.py:279 +#, python-format +msgid "Could not load %(object_repr)s version - unknown serializer %(format)s." +msgstr "无法载入 %(object_repr)s 版本 - 未知的序列化 %(format)s。" + +#: .\models.py:335 +#, fuzzy +msgid "version" +msgstr "版本" + +#: .\models.py:336 +msgid "versions" +msgstr "版本" + +#: .\templates\reversion\object_history.html:8 msgid "" "Choose a date from the list below to revert to a previous version of this " "object." msgstr "单击下方的日期以恢复当前对象到之前的版本。" -#: templates/reversion/object_history.html:15 -#: templates/reversion/recover_list.html:24 +#: .\templates\reversion\object_history.html:15 +#: .\templates\reversion\recover_list.html:23 msgid "Date/time" msgstr "时间" -#: templates/reversion/object_history.html:16 +#: .\templates\reversion\object_history.html:16 msgid "User" msgstr "用户" -#: templates/reversion/object_history.html:17 -msgid "Comment" -msgstr "评论" +#: .\templates\reversion\object_history.html:17 +msgid "Action" +msgstr "操作" -#: templates/reversion/object_history.html:38 +#: .\templates\reversion\object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "此对象不存在任何变更历史,它可能不是通过管理站点添加的。" -#: templates/reversion/recover_form.html:8 -#: templates/reversion/recover_list.html:8 -#: templates/reversion/revision_form.html:8 +#: .\templates\reversion\recover_form.html:7 +#: .\templates\reversion\recover_list.html:7 +#: .\templates\reversion\revision_form.html:7 msgid "Home" msgstr "首页" -#: templates/reversion/recover_form.html:18 +#: .\templates\reversion\recover_form.html:20 msgid "Press the save button below to recover this version of the object." msgstr "单击保存按钮以恢复为此版本。" -#: templates/reversion/recover_list.html:18 +#: .\templates\reversion\recover_list.html:17 msgid "" "Choose a date from the list below to recover a deleted version of an object." msgstr "单击下方的日期以恢复一个已删除的对象。" -#: templates/reversion/recover_list.html:38 +#: .\templates\reversion\recover_list.html:37 msgid "There are no deleted objects to recover." msgstr "没有可供恢复的已删除对象。" -#: templates/reversion/revision_form.html:12 +#: .\templates\reversion\revision_form.html:11 msgid "History" msgstr "历史" -#: templates/reversion/revision_form.html:13 +#: .\templates\reversion\revision_form.html:12 #, python-format msgid "Revert %(verbose_name)s" msgstr "恢复 %(verbose_name)s" -#: templates/reversion/revision_form.html:26 +#: .\templates\reversion\revision_form.html:21 msgid "Press the save button below to revert to this version of the object." msgstr "单击保存按钮将此对象恢复到此版本。" diff --git a/reversion/models.py b/reversion/models.py index 4b245d92..c259a686 100644 --- a/reversion/models.py +++ b/reversion/models.py @@ -113,6 +113,8 @@ def __str__(self): return ", ".join(force_str(version) for version in self.version_set.all()) class Meta: + verbose_name = _('revision') + verbose_name_plural = _('revisions') app_label = "reversion" ordering = ("-pk",) @@ -330,6 +332,8 @@ def __str__(self): return self.object_repr class Meta: + verbose_name = _('version') + verbose_name_plural = _('versions') app_label = 'reversion' unique_together = ( ("db", "content_type", "object_id", "revision"),