diff --git a/apps/authentication/templates/authentication/_msg_different_city.html b/apps/authentication/templates/authentication/_msg_different_city.html index 02dbf4271..b39fd6bba 100644 --- a/apps/authentication/templates/authentication/_msg_different_city.html +++ b/apps/authentication/templates/authentication/_msg_different_city.html @@ -8,10 +8,8 @@

{% trans 'Username' %}: {{ username }}
{% trans 'Login time' %}: {{ time }}
- {% trans 'Login city' %}: {{ city }}({{ ip }}) + {% trans 'Login city' %}: {{ city }}({{ ip }})

- --

{% trans 'If you suspect that the login behavior is abnormal, please modify the account password in time.' %}

\ No newline at end of file diff --git a/apps/authentication/templates/authentication/_msg_reset_password.html b/apps/authentication/templates/authentication/_msg_reset_password.html index f53bda209..6f0132ac3 100644 --- a/apps/authentication/templates/authentication/_msg_reset_password.html +++ b/apps/authentication/templates/authentication/_msg_reset_password.html @@ -10,8 +10,7 @@ {% trans 'Click here reset password' %}

- -- +

{% trans 'This link is valid for 1 hour. After it expires' %} {% trans 'request new one' %} diff --git a/apps/authentication/templates/authentication/_msg_rest_password_success.html b/apps/authentication/templates/authentication/_msg_rest_password_success.html index dce3ee13c..2529001ac 100644 --- a/apps/authentication/templates/authentication/_msg_rest_password_success.html +++ b/apps/authentication/templates/authentication/_msg_rest_password_success.html @@ -5,11 +5,10 @@ {% trans 'Your password has just been successfully updated' %}

- {% trans 'IP' %}: {{ ip_address }}
- {% trans 'Browser' %}: {{ browser }} + {% trans 'IP' %}: {{ ip_address }}
+ {% trans 'Browser' %}: {{ browser }}

--

- {% trans 'If the password update was not initiated by you, your account may have security issues' %}
+ {% trans 'If the password update was not initiated by you, your account may have security issues' %}
{% trans 'If you have any questions, you can contact the administrator' %}

diff --git a/apps/authentication/templates/authentication/_msg_rest_public_key_success.html b/apps/authentication/templates/authentication/_msg_rest_public_key_success.html index c8e8fabb6..98e6f3c71 100644 --- a/apps/authentication/templates/authentication/_msg_rest_public_key_success.html +++ b/apps/authentication/templates/authentication/_msg_rest_public_key_success.html @@ -5,11 +5,10 @@ {% trans 'Your public key has just been successfully updated' %}

- {% trans 'IP' %}: {{ ip_address }}
- {% trans 'Browser' %}: {{ browser }} + {% trans 'IP' %}: {{ ip_address }}
+ {% trans 'Browser' %}: {{ browser }}

--

- {% trans 'If the public key update was not initiated by you, your account may have security issues' %}
+ {% trans 'If the public key update was not initiated by you, your account may have security issues' %}
{% trans 'If you have any questions, you can contact the administrator' %}

diff --git a/apps/perms/templates/perms/_msg_permed_items_expire.html b/apps/perms/templates/perms/_msg_permed_items_expire.html index eb2a3cc47..eb3d8c172 100644 --- a/apps/perms/templates/perms/_msg_permed_items_expire.html +++ b/apps/perms/templates/perms/_msg_permed_items_expire.html @@ -15,8 +15,7 @@ {% endfor %} -
-- +

{% trans 'If you have any question, please contact the administrator' %}

diff --git a/apps/users/templates/users/_msg_password_expire_reminder.html b/apps/users/templates/users/_msg_password_expire_reminder.html index bfd290156..7cde70165 100644 --- a/apps/users/templates/users/_msg_password_expire_reminder.html +++ b/apps/users/templates/users/_msg_password_expire_reminder.html @@ -9,9 +9,8 @@

{% trans 'Click here update password' %} -
+

--

{% trans 'If your password has expired, please click the link below to' %} {% trans 'Reset password' %} diff --git a/apps/users/templates/users/_msg_user_created.html b/apps/users/templates/users/_msg_user_created.html index e3e23bb89..8a7f35422 100644 --- a/apps/users/templates/users/_msg_user_created.html +++ b/apps/users/templates/users/_msg_user_created.html @@ -15,9 +15,7 @@ {% trans 'click here to set your password' %}

- - - - +

{% trans 'This link is valid for 1 hour. After it expires' %} {% trans 'request new one' %}