[pull] master from etianen:master

.github/workflows/python-package.yml

@@ -72,6 +72,9 @@ jobs:
     - name: Lint with flake8
       run: |
         flake8
+    - name: Check no missing migrations
+      run: |
+        tests/manage.py makemigrations --check
     - name: Test with unittest
       run: |
         coverage run tests/manage.py test tests

.gitignore

@@ -13,3 +13,4 @@ MANIFEST
 docs/_build
 .coverage
 *.sqlite3
+.idea/

CHANGELOG.rst

@@ -3,6 +3,18 @@
 django-reversion changelog
 ==========================
 
+5.0.12 - 2024-01-30
+-------------------
+
+- Fix missing migration introduced in v5.0.11.
+
+
+5.0.11 - 2024-01-29
+-------------------
+
+- Improved the Chinese translation (@zengqiu).
+
+
 5.0.10 - 2023-12-30
 -------------------
 

reversion/__init__.py

@@ -36,4 +36,4 @@
         get_registered_models,
     )
 
-__version__ = VERSION = (5, 0, 10)
+__version__ = VERSION = (5, 0, 12)

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'

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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\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 "单击保存按钮将此对象恢复到此版本。"

reversion/migrations/0001_squashed_0004_auto_20160611_1202.py

@@ -23,7 +23,9 @@ class Migration(migrations.Migration):
                 ('user', models.ForeignKey(blank=True, help_text='The user who created this revision.', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='user')),
             ],
             options={
-                "ordering": ("-pk",)
+                "ordering": ("-pk",),
+                'verbose_name': 'revision',
+                'verbose_name_plural': 'revisions',
             },
         ),
         migrations.CreateModel(
@@ -39,7 +41,9 @@ class Migration(migrations.Migration):
                 ('db', models.CharField(help_text='The database the model under version control is stored in.', max_length=191)),
             ],
             options={
-                "ordering": ("-pk",)
+                "ordering": ("-pk",),
+                'verbose_name': 'version',
+                'verbose_name_plural': 'versions',
             },
         ),
         migrations.AlterUniqueTogether(