diff --git a/apps/acls/notifications.py b/apps/acls/notifications.py index ac8b7e4c6..787bcafe5 100644 --- a/apps/acls/notifications.py +++ b/apps/acls/notifications.py @@ -14,11 +14,11 @@ class UserLoginReminderMsg(UserMessage): subject = _('User login reminder') template_name = 'acls/user_login_reminder.html' contexts = [ - {"name": "city", "label": _('Login city'), "default": "北京"}, - {"name": "username", "label": _('User'), "default": "zhangsan"}, - {"name": "ip", "label": "IP", "default": "8.8.8.8"}, - {"name": "recipient_name", "label": _("Recipient name"), "default": "zhangsan"}, - {"name": "recipient_username", "label": _("Recipient username"), "default": "张三"}, + {"name": "city", "label": _('Login city'), "default": "Shanghai"}, + {"name": "username", "label": _('User'), "default": "John"}, + {"name": "ip", "label": "IP", "default": "192.168.1.1"}, + {"name": "recipient_name", "label": _("Recipient name"), "default": "John"}, + {"name": "recipient_username", "label": _("Recipient username"), "default": "john"}, {"name": "user_agent", "label": _('User agent'), "default": "Mozilla/5.0"}, {"name": "acl_name", "label": _('ACL name'), "default": "login acl"}, {"name": "login_from", "label": _('Login from'), "default": "web"}, @@ -64,12 +64,12 @@ class AssetLoginReminderMsg(UserMessage): subject = _('User login alert for asset') template_name = 'acls/asset_login_reminder.html' contexts = [ - {"name": "city", "label": _('Login city'), "default": "北京"}, - {"name": "username", "label": _('User'), "default": "zhangsan"}, - {"name": "name", "label": _('Name'), "default": "zhangsan"}, + {"name": "city", "label": _('Login city'), "default": "Shanghai"}, + {"name": "username", "label": _('User'), "default": "John"}, + {"name": "name", "label": _('Name'), "default": "John"}, {"name": "asset", "label": _('Asset'), "default": "dev server"}, - {"name": "recipient_name", "label": _('Recipient name'), "default": "zhangsan"}, - {"name": "recipient_username", "label": _('Recipient username'), "default": "张三"}, + {"name": "recipient_name", "label": _('Recipient name'), "default": "John"}, + {"name": "recipient_username", "label": _('Recipient username'), "default": "john"}, {"name": "account", "label": _('Account Input username'), "default": "root"}, {"name": "account_name", "label": _('Account name'), "default": "root"}, {"name": "acl_name", "label": _('ACL name'), "default": "login acl"}, diff --git a/apps/authentication/notifications.py b/apps/authentication/notifications.py index d5aceadc6..7b15f2d1e 100644 --- a/apps/authentication/notifications.py +++ b/apps/authentication/notifications.py @@ -12,10 +12,10 @@ class DifferentCityLoginMessage(UserMessage): subject = _('Different city login reminder') template_name = 'authentication/_msg_different_city.html' contexts = [ - {"name": "city", "label": _('Login city'), "default": "北京"}, - {"name": "username", "label": _('User'), "default": "zhangsan"}, - {"name": "name", "label": _('Name'), "default": "zhangsan"}, - {"name": "ip", "label": "IP", "default": "8.8.8.8"}, + {"name": "city", "label": _('Login city'), "default": "Shanghai"}, + {"name": "username", "label": _('User'), "default": "john"}, + {"name": "name", "label": _('Name'), "default": "John"}, + {"name": "ip", "label": "IP", "default": "192.168.1.1"}, {"name": "time", "label": _('Login Date'), "default": "2025-01-01 12:00:00"}, ] @@ -52,9 +52,9 @@ class OAuthBindMessage(UserMessage): subject = _('OAuth binding reminder') template_name = 'authentication/_msg_oauth_bind.html' contexts = [ - {"name": "username", "label": _('User'), "default": "zhangsan"}, - {"name": "name", "label": _('Name'), "default": "zhangsan"}, - {"name": "ip", "label": "IP", "default": "8.8.8.8"}, + {"name": "username", "label": _('User'), "default": "john"}, + {"name": "name", "label": _('Name'), "default": "John"}, + {"name": "ip", "label": "IP", "default": "192.168.1.1"}, {"name": "oauth_name", "label": _('OAuth name'), "default": "WeCom"}, {"name": "oauth_id", "label": _('OAuth ID'), "default": "000001"}, ] diff --git a/apps/users/notifications.py b/apps/users/notifications.py index e59e82cc0..e8efefc1a 100644 --- a/apps/users/notifications.py +++ b/apps/users/notifications.py @@ -2,7 +2,6 @@ from collections import defaultdict from urllib.parse import urljoin from django.conf import settings -from django.template.loader import render_to_string from django.utils import timezone from django.utils.translation import gettext_lazy as _ @@ -15,11 +14,11 @@ class UserCreatedMsg(UserMessage): subject = settings.EMAIL_CUSTOM_USER_CREATED_SUBJECT template_name = 'users/_msg_user_created.html' contexts = [ - {"name": "honorific", "label": _('Honorific'), "default": "zhangsan"}, + {"name": "honorific", "label": _('Honorific'), "default": "John"}, {"name": "content", "label": _('Content'), "default": "Welcome to use our system."}, - {"name": "username", "label": _('Username'), "default": "zhangsan"}, - {"name": "name", "label": _('Name'), "default": "张三"}, - {"name": "email", "label": _('Email'), "default": "123456@qq.com"}, + {"name": "username", "label": _('Username'), "default": "john"}, + {"name": "name", "label": _('Name'), "default": "John"}, + {"name": "email", "label": _('Email'), "default": "john@example.com"}, {"name": "rest_password_url", "label": _('Reset password url'), "default": "https://example.com/reset-password"}, {"name": "rest_password_token", "label": _('Reset password token'), "default": "abcdefg1234567"}, @@ -64,7 +63,7 @@ class ResetPasswordMsg(UserMessage): subject = _('Reset password') template_name = 'authentication/_msg_reset_password.html' contexts = [ - {"name": "email", "label": _('Email'), "default": "123456@qq.com"}, + {"name": "email", "label": _('Email'), "default": "john@example.com"}, {"name": "rest_password_url", "label": _('Reset password url'), "default": "https://example.com/reset-password"}, {"name": "rest_password_token", "label": _('Reset password token'), "default": "abcdefg1234567"}, @@ -103,7 +102,7 @@ class ResetPasswordSuccessMsg(UserMessage): subject = _('Reset password success') template_name = 'authentication/_msg_rest_password_success.html' contexts = [ - {"name": "name", "label": _('Name'), "default": "张三"}, + {"name": "name", "label": _('Name'), "default": "john"}, {"name": "ip_address", "label": _('IP address'), "default": "192.168.1.1"}, {"name": "browser", "label": _('Browser'), "default": "Mozilla/firefox"} ] @@ -142,7 +141,7 @@ class ResetPublicKeySuccessMsg(UserMessage): subject = _('Reset public key success') template_name = 'authentication/_msg_rest_public_key_success.html' contexts = [ - {"name": "name", "label": _('Name'), "default": "张三"}, + {"name": "name", "label": _('Name'), "default": "john"}, {"name": "ip_address", "label": _('IP address'), "default": "192.168.1.1"}, {"name": "browser", "label": _('Browser'), "default": "Mozilla/firefox"} ] @@ -181,12 +180,12 @@ class PasswordExpirationReminderMsg(UserMessage): subject = _('Password is about expire') template_name = 'users/_msg_password_expire_reminder.html' contexts = [ - {"name": "name", "label": _('Name'), "default": "张三"}, + {"name": "name", "label": _('Name'), "default": "john"}, {"name": "date_password_expired", "label": _('Password expiration date'), "default": "2025-01-01 12:00:00"}, {"name": "update_password_url", "label": _('Update password url'), "default": "https://example.com/update-password"}, {"name": "forget_password_url", "label": _('Login url'), "default": "https://example.com/forget-password"}, - {"name": "email", "label": _('Email'), "default": "123456@qq.com"}, + {"name": "email", "label": _('Email'), "default": "john@example.com"}, {"name": "login_url", "label": _('Login url'), "default": "https://example.com/login"}, ] @@ -221,7 +220,7 @@ class UserExpirationReminderMsg(UserMessage): subject = _('Account is about expire') template_name = 'users/_msg_account_expire_reminder.html' contexts = [ - {"name": "name", "label": _('Name'), "default": "张三"}, + {"name": "name", "label": _('Name'), "default": "john"}, {"name": "date_expired", "label": _('Expiration date'), "default": "2025-01-01 12:00:00"} ] @@ -232,7 +231,7 @@ class UserExpirationReminderMsg(UserMessage): 'name': self.user.name, 'date_expired': date_expired } - message = render_to_string(self.template_name, context) + message = custom_render_to_string(self.template_name, context) return { 'subject': str(self.subject), 'message': message @@ -249,7 +248,7 @@ class ResetSSHKeyMsg(UserMessage): subject = _('Reset SSH Key') template_name = 'users/_msg_reset_ssh_key.html' contexts = [ - {"name": "name", "label": _('Name'), "default": "张三"}, + {"name": "name", "label": _('Name'), "default": "john"}, {"name": "url", "label": _('Update SSH Key url'), "default": "https://example.com/profile/password-and-ssh-key"} ] @@ -276,7 +275,7 @@ class ResetMFAMsg(UserMessage): subject = _('Reset MFA') template_name = 'users/_msg_reset_mfa.html' contexts = [ - {"name": "name", "label": _('Name'), "default": "张三"}, + {"name": "name", "label": _('Name'), "default": "john"}, {"name": "url", "label": _('Reset MFA url'), "default": "https://example.com/profile/mfa"} ]