Merge branch 'master' into 1295-error-with-identifiers-with-forward-s…

…lash

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
 

.github/workflows/test.yml

@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -101,7 +101,7 @@ jobs:
           sudo apt-get install -y gettext
 
       - name: Set up newest stable Python version
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
           cache: 'pip'

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 ---
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.5
+    rev: 1.7.6
     hooks:
       - id: bandit
         args:
           - "-x *test*.py"
 
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.12.1
     hooks:
       - id: black
         language_version: python3.8
@@ -21,12 +21,12 @@ repos:
           - "--config=tox.ini"
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: requirements-txt-fixer
         files: requirements/.*\.txt$
@@ -40,14 +40,14 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.32.0
+    rev: v1.33.0
     hooks:
       - id: yamllint
         args:
           - "--strict"
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.13.0
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]

CHANGES.rst

@@ -15,6 +15,7 @@ Unreleased
 - Added temporary requirement on ``asgiref>=3.6`` while the minimum required Django
   version is lower than 4.2 (gh-1261)
 - Small performance optimization of the ``clean-duplicate_history`` command (gh-1015)
+- Support Simplified Chinese translation (gh-1281)
 - Fixed error in history view of object with forward slash in primary key (gh-1295)
 
 3.4.0 (2023-08-18)

requirements/coverage.txt

@@ -1,2 +1,2 @@
-coverage==7.3.1
+coverage==7.3.2
 toml==0.10.2

requirements/lint.txt

@@ -1,3 +1,3 @@
-black==23.9.1
+black==23.12.0
 flake8==6.1.0
 isort==5.12.0

requirements/postgres.txt

@@ -1,4 +1,4 @@
 # DEV: Replace this with `psycopg[binary]` when the minimum required Django version is
 #      4.2 or higher, as this is likely to be deprecated in the future
 #      (see https://docs.djangoproject.com/en/4.2/releases/4.2/#psycopg-3-support)
-psycopg2-binary==2.9.8
+psycopg2-binary==2.9.9

simple_history/locale/zh_Hans/LC_MESSAGES/django.po

@@ -0,0 +1,132 @@
+# Simplified Chinese translation for django-simple-history
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the django-simple-history package.
+# Peihao Ren <[email protected]>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: django-simple-history VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-11-30 22:12+0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Peihao Ren <[email protected]>\n"
+"Language-Team: Simplified Chinese <[email protected]>\n"
+"Language: zh_Hans\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"
+
+#: simple_history/admin.py:102
+#, python-format
+msgid "View history: %s"
+msgstr "查看历史记录: %s"
+
+#: simple_history/admin.py:104
+#, python-format
+msgid "Change history: %s"
+msgstr "修改历史记录: %s"
+
+#: simple_history/admin.py:110
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" 已成功修改。"
+
+#: simple_history/admin.py:116
+msgid "You may edit it again below"
+msgstr "你可在下方再次编辑"
+
+#: simple_history/admin.py:217
+#, python-format
+msgid "View %s"
+msgstr "查看 %s"
+
+#: simple_history/admin.py:219
+#, python-format
+msgid "Revert %s"
+msgstr "还原 %s"
+
+#: simple_history/models.py:552
+msgid "Created"
+msgstr "已创建"
+
+#: simple_history/models.py:552
+msgid "Changed"
+msgstr "已修改"
+
+#: simple_history/models.py:552
+msgid "Deleted"
+msgstr "已删除"
+
+#: simple_history/templates/simple_history/_object_history_list.html:9
+msgid "Object"
+msgstr "记录对象"
+
+#: simple_history/templates/simple_history/_object_history_list.html:13
+msgid "Date/time"
+msgstr "日期/时间"
+
+#: simple_history/templates/simple_history/_object_history_list.html:14
+msgid "Comment"
+msgstr "备注"
+
+#: simple_history/templates/simple_history/_object_history_list.html:15
+msgid "Changed by"
+msgstr "修改人"
+
+#: simple_history/templates/simple_history/_object_history_list.html:16
+msgid "Change reason"
+msgstr "修改原因"
+
+#: simple_history/templates/simple_history/_object_history_list.html:37
+msgid "None"
+msgstr "无"
+
+#: simple_history/templates/simple_history/object_history.html:11
+msgid ""
+"Choose a date from the list below to revert to a previous version of this "
+"object."
+msgstr "从下面的列表中选择一个日期以还原到该记录对象的先前版本"
+
+#: simple_history/templates/simple_history/object_history.html:16
+msgid "This object doesn't have a change history."
+msgstr "该记录对象没有修改的记录"
+
+#: simple_history/templates/simple_history/object_history_form.html:7
+msgid "Home"
+msgstr "主页"
+
+#: simple_history/templates/simple_history/object_history_form.html:11
+msgid "History"
+msgstr "历史记录"
+
+#: simple_history/templates/simple_history/object_history_form.html:12
+#, python-format
+msgid "View %(verbose_name)s"
+msgstr "查看 %(verbose_name)s"
+
+#: simple_history/templates/simple_history/object_history_form.html:12
+#, python-format
+msgid "Revert %(verbose_name)s"
+msgstr "还原 %(verbose_name)s"
+
+#: simple_history/templates/simple_history/object_history_form.html:25
+msgid ""
+"Press the 'Revert' button below to revert to this version of the object."
+msgstr "按下面的“还原”按钮还原记录到当前版本。"
+
+#: simple_history/templates/simple_history/object_history_form.html:25
+msgid "Press the 'Change History' button below to edit the history."
+msgstr "按下面的“修改历史记录”按钮编辑历史记录。"
+
+#: simple_history/templates/simple_history/submit_line.html:4
+msgid "Revert"
+msgstr "还原"
+
+#: simple_history/templates/simple_history/submit_line.html:6
+msgid "Change History"
+msgstr "修改历史记录"
+
+#: simple_history/templates/simple_history/submit_line.html:7
+msgid "Close"
+msgstr "关闭"