Merge branch 'lina' of github.com:jumpserver/jumpserver into lina

5f234585 · baltery · ad1c17aa · 3a79bfd5 · 5f234585 · 5f234585
Showing with 143 addition and 153 deletion

apps/locale/zh/LC_MESSAGES/django.mo apps/locale/zh/LC_MESSAGES/django.mo +0 -0

apps/locale/zh/LC_MESSAGES/django.po apps/locale/zh/LC_MESSAGES/django.po +142 -152

apps/ops/mixin.py apps/ops/mixin.py +1 -1

未找到文件。
--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
--- a/apps/ops/mixin.py
+++ b/apps/ops/mixin.py
@@ -110,7 +110,7 @@ class PeriodTaskSerializerMixin(serializers.Serializer):
        max_length=128, allow_blank=True,
        allow_null=True, required=False, label=_('Regularly perform')
    )
-    interval = serializers.IntegerField(allow_null=True, required=False)
+    interval = serializers.IntegerField(allow_null=True, required=False, label=_('Interval'))

    INTERVAL_MAX = 65535
    INTERVAL_MIN = 1