From 42c3c858631498b5f0fe51f9ddd6b25b1f39df69 Mon Sep 17 00:00:00 2001 From: Michael Bai Date: Thu, 9 Sep 2021 21:11:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=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/authentication/forms.py | 2 +- apps/common/message/backends/sms/__init__.py | 2 +- apps/locale/zh/LC_MESSAGES/django.po | 98 +++---------------- .../migrations/0002_auto_20210909_1946.py | 30 ++++++ .../0003_init_user_msg_subscription.py | 43 -------- 5 files changed, 44 insertions(+), 131 deletions(-) delete mode 100644 apps/notifications/migrations/0003_init_user_msg_subscription.py diff --git a/apps/authentication/forms.py b/apps/authentication/forms.py index 839d71be6..948ceabff 100644 --- a/apps/authentication/forms.py +++ b/apps/authentication/forms.py @@ -43,7 +43,7 @@ class UserLoginForm(forms.Form): class UserCheckOtpCodeForm(forms.Form): - code = forms.CharField(label=_('Code'), max_length=6) + code = forms.CharField(label=_('MFA Code'), max_length=6) mfa_type = forms.CharField(label=_('MFA type'), max_length=6) diff --git a/apps/common/message/backends/sms/__init__.py b/apps/common/message/backends/sms/__init__.py index a0662ba10..be32c6e94 100644 --- a/apps/common/message/backends/sms/__init__.py +++ b/apps/common/message/backends/sms/__init__.py @@ -35,7 +35,7 @@ class SMS_MESSAGE(TextChoices): except KeyError as e: raise JMSException( code=f'{settings.SMS_BACKEND}_sign_and_tmpl_bad', - detail=_('SMS sign and template bad: {}').format(e) + detail=_('Invalid SMS sign and template: {}').format(e) ) diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 4bc4c919c..e36335bda 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -1618,8 +1618,8 @@ msgid "{} days auto login" msgstr "{} 天内自动登录" #: authentication/forms.py:46 -msgid "Code" -msgstr "" +msgid "MFA Code" +msgstr "MFA 验证码" #: authentication/forms.py:47 msgid "MFA type" @@ -1644,7 +1644,7 @@ msgstr "过期时间" #: authentication/sms_verify_code.py:17 msgid "The verification code has expired. Please resend it" -msgstr "" +msgstr "验证码已过期，请重新发送" #: authentication/sms_verify_code.py:22 msgid "The verification code is incorrect" @@ -1652,7 +1652,7 @@ msgstr "验证码错误" #: authentication/sms_verify_code.py:27 msgid "Please wait {} seconds before sending" -msgstr "" +msgstr "请在 {} 秒后发送" #: authentication/templates/authentication/_access_key_modal.html:6 msgid "API key list" @@ -1931,7 +1931,7 @@ msgstr "一次性密码" #: authentication/views/mfa.py:50 notifications/backends/__init__.py:15 msgid "SMS" -msgstr "" +msgstr "短信" #: authentication/views/wecom.py:41 msgid "WeCom Error, Please contact your system administrator" @@ -2058,8 +2058,8 @@ msgid "Network error, please contact system administrator" msgstr "网络错误，请联系系统管理员" #: common/message/backends/sms/__init__.py:38 -msgid "SMS sign and template bad: {}" -msgstr "" +msgid "Invalid SMS sign and template: {}" +msgstr "无效的短信签名和模版: {}" #: common/message/backends/sms/__init__.py:43 msgid "Alibaba" @@ -2754,11 +2754,11 @@ msgstr "启用 SMS" #: settings/serializers/auth/sms.py:11 msgid "Test phone" -msgstr "" +msgstr "测试手机号" #: settings/serializers/auth/sms.py:25 settings/serializers/auth/sms.py:43 msgid "Signatures and Templates" -msgstr "" +msgstr "签名和模版" #: settings/serializers/auth/sms.py:25 settings/serializers/auth/sms.py:43 msgid "" @@ -3772,7 +3772,7 @@ msgstr "用户没有权限" #: terminal/api/sharing.py:28 msgid "Secure session sharing settings is disabled" -msgstr "" +msgstr "未开启会话共享" #: terminal/api/storage.py:30 msgid "Deleting the default storage is not allowed" @@ -3912,7 +3912,7 @@ msgstr "会话分享" #: terminal/models/sharing.py:67 terminal/serializers/sharing.py:49 msgid "Joiner" -msgstr "" +msgstr "加入者" #: terminal/models/sharing.py:70 msgid "Date joined" @@ -4394,7 +4394,7 @@ msgstr "工单受理人" #: tickets/models/ticket.py:45 msgid "Title" -msgstr "" +msgstr "标题" #: tickets/models/ticket.py:53 msgid "State" @@ -6051,77 +6051,3 @@ msgstr "旗舰版" #: xpack/plugins/license/models.py:77 msgid "Community edition" msgstr "社区版" - -#~ msgid "Enable XRDP server" -#~ msgstr "启用 XRDP 服务，允许 RDP 客户端" - -#~ msgid "Database Change auth plan" -#~ msgstr "改密计划" - -#~ msgid "Database Change auth plan execution" -#~ msgstr "改密计划执行" - -#~ msgid "SystemUser" -#~ msgstr "系统用户" - -#~ msgid "Database Change auth plan task" -#~ msgstr "改密计划任务" - -#~ msgid "Append SSH KEY" -#~ msgstr "追加新密钥" - -#~ msgid "Empty and append SSH KEY" -#~ msgstr "清空所有密钥再追加新密钥" - -#~ msgid "Empty current user and append SSH KEY" -#~ msgstr "清空当前账号密钥再追加新密钥" - -#~ msgid "SSH Key strategy" -#~ msgstr "SSH Key 策略" - -#~ msgid "Manual trigger" -#~ msgstr "手动触发" - -#~ msgid "Timing trigger" -#~ msgstr "定时触发" - -#~ msgid "Trigger mode" -#~ msgstr "触发模式" - -#~ msgid "Change Password" -#~ msgstr "修改密码" - -#~ msgid "Change SSH Key" -#~ msgstr "修改密钥" - -#~ msgid "Require password strategy perform setting" -#~ msgstr "需要密码策略执行设置" - -#~ msgid "Require password perform setting" -#~ msgstr "需要密码执行设置" - -#~ msgid "Require password rule perform setting" -#~ msgstr "需要密码规则执行设置" - -#~ msgid "Require ssh key strategy or ssh key perform setting" -#~ msgstr "需要ssh密钥策略或ssh密钥执行设置" - -#~ msgid "Unix admin user" -#~ msgstr "Unix 特权用户" - -#~ msgid "Windows admin user" -#~ msgstr "Windows 特权用户" - -#, fuzzy -#~| msgid "Account key" -#~ msgid "Service account key" -#~ msgstr "账户密钥" - -#~ msgid "App" -#~ msgstr "应用" - -#~ msgid "Application name" -#~ msgstr "应用名称" - -#~ msgid "Authorization rules" -#~ msgstr "授权规则" diff --git a/apps/notifications/migrations/0002_auto_20210909_1946.py b/apps/notifications/migrations/0002_auto_20210909_1946.py index c7006130d..75f71fad7 100644 --- a/apps/notifications/migrations/0002_auto_20210909_1946.py +++ b/apps/notifications/migrations/0002_auto_20210909_1946.py @@ -5,11 +5,40 @@ from django.db import migrations, models import django.db.models.deletion +def init_user_msg_subscription(apps, schema_editor): + UserMsgSubscription = apps.get_model('notifications', 'UserMsgSubscription') + User = apps.get_model('users', 'User') + + to_create = [] + users = User.objects.all() + for user in users: + receive_backends = [] + + receive_backends.append('site_msg') + + if user.email: + receive_backends.append('email') + + if user.wecom_id: + receive_backends.append('wecom') + + if user.dingtalk_id: + receive_backends.append('dingtalk') + + if user.feishu_id: + receive_backends.append('feishu') + + to_create.append(UserMsgSubscription(user=user, receive_backends=receive_backends)) + UserMsgSubscription.objects.bulk_create(to_create) + print(f'\n Init user message subscription: {len(to_create)}') + + class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('notifications', '0001_initial'), + ('users', '0036_user_feishu_id'), ] operations = [ @@ -22,4 +51,5 @@ class Migration(migrations.Migration): name='user', field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='user_msg_subscription', to=settings.AUTH_USER_MODEL), ), + migrations.RunPython(init_user_msg_subscription) ] diff --git a/apps/notifications/migrations/0003_init_user_msg_subscription.py b/apps/notifications/migrations/0003_init_user_msg_subscription.py deleted file mode 100644 index 093bf8749..000000000 --- a/apps/notifications/migrations/0003_init_user_msg_subscription.py +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by Django 3.1.12 on 2021-08-23 07:52 - -from django.db import migrations - - -def init_user_msg_subscription(apps, schema_editor): - UserMsgSubscription = apps.get_model('notifications', 'UserMsgSubscription') - User = apps.get_model('users', 'User') - - to_create = [] - users = User.objects.all() - for user in users: - receive_backends = [] - - receive_backends.append('site_msg') - - if user.email: - receive_backends.append('email') - - if user.wecom_id: - receive_backends.append('wecom') - - if user.dingtalk_id: - receive_backends.append('dingtalk') - - if user.feishu_id: - receive_backends.append('feishu') - - to_create.append(UserMsgSubscription(user=user, receive_backends=receive_backends)) - UserMsgSubscription.objects.bulk_create(to_create) - print(f'\n Init user message subscription: {len(to_create)}') - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0036_user_feishu_id'), - ('notifications', '0002_auto_20210909_1946'), - ] - - operations = [ - migrations.RunPython(init_user_msg_subscription) - ]