From 314e4301f3fd530b4277c6fcae09341ec1192107 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 5 Feb 2024 14:13:07 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/serializers/mixin.py        | 5 ++++-
 apps/i18n/core/en/LC_MESSAGES/django.mo | 4 ++--
 apps/i18n/core/en/LC_MESSAGES/django.po | 8 ++------
 apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 ++--
 apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 ++--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/common/serializers/mixin.py b/apps/common/serializers/mixin.py
index 81fac91d9..5d952933b 100644
--- a/apps/common/serializers/mixin.py
+++ b/apps/common/serializers/mixin.py
@@ -347,6 +347,7 @@ class SomeFieldsMixin:
     def order_fields(fields):
         bool_fields = []
         datetime_fields = []
+        common_fields = []
         other_fields = []
 
         for name, field in fields.items():
@@ -355,9 +356,11 @@ class SomeFieldsMixin:
                 bool_fields.append(to_add)
             elif isinstance(field, serializers.DateTimeField):
                 datetime_fields.append(to_add)
+            elif name in ('comment', 'created_by', 'updated_by'):
+                common_fields.append(to_add)
             else:
                 other_fields.append(to_add)
-        _fields = [*other_fields, *bool_fields, *datetime_fields]
+        _fields = [*other_fields, *bool_fields, *datetime_fields, *common_fields]
         fields = OrderedDict()
         for name, field in _fields:
             fields[name] = field
diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo
index 2ced23ae3..455e3bc71 100644
--- a/apps/i18n/core/en/LC_MESSAGES/django.mo
+++ b/apps/i18n/core/en/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4072e28aeee949d188b48b5969b5554d7896674cad9aa18630791fdfca5086ed
-size 1157
+oid sha256:0f38416ee042bf98512fadd5dc339c7476f1c40c99f8e4fd4fa6834c894c4345
+size 1398
diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po
index 6b67ef0f5..bc56fd751 100644
--- a/apps/i18n/core/en/LC_MESSAGES/django.po
+++ b/apps/i18n/core/en/LC_MESSAGES/django.po
@@ -7710,14 +7710,12 @@ msgstr ""
 
 #: users/models/user.py:838 users/serializers/profile.py:128
 #: users/serializers/user.py:172
-#, fuzzy
-#| msgid "First login"
 msgid "Is first login"
 msgstr "First login"
 
 #: users/models/user.py:848
 msgid "Date password last updated"
-msgstr ""
+msgstr "Password last updated"
 
 #: users/models/user.py:851
 msgid "Need update password"
@@ -7898,14 +7896,12 @@ msgid "Login blocked"
 msgstr ""
 
 #: users/serializers/user.py:99 users/serializers/user.py:181
-#, fuzzy
-#| msgid "OTP bound"
 msgid "Is OTP bound"
 msgstr "OTP bound"
 
 #: users/serializers/user.py:101
 msgid "Can public key authentication"
-msgstr ""
+msgstr "Public key auth"
 
 #: users/serializers/user.py:166
 msgid "Groups"
diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo
index 41d45e196..774452a8f 100644
--- a/apps/i18n/core/ja/LC_MESSAGES/django.mo
+++ b/apps/i18n/core/ja/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a57ad4a418754f6e29a79e49e6fa8375e158a000331b1d5ee32d1d0eefceb5c0
-size 170096
+oid sha256:d58d2e5e46b76fdd73a85a6620279ba3cfe8ff402fcbbf859d67f3d7c011aaf4
+size 170717
diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo
index d14aba4f4..78c08e1e7 100644
--- a/apps/i18n/core/zh/LC_MESSAGES/django.mo
+++ b/apps/i18n/core/zh/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cf70b44c5a7e9b76558aac8a6974c50916f6357e2e9d8f15f043d145faf0522
-size 140567
+oid sha256:03ddc4852b8fec1981d4ec0aa746bee83f524cb2823359e3a3bf86e8d3b7497a
+size 141101