diff --git a/.prettierignore b/.prettierignore index 60bff4f5..54f42aa5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,3 +7,4 @@ datumaro/ keys/ logs/ static/ +templates/ diff --git a/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html b/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html index c121b810..ec80776a 100644 --- a/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html +++ b/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html @@ -1,5 +1,6 @@ -{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with -site_name=current_site.name site_domain=current_site.domain %}Hello from {{ site_name }}! +{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %} +{% blocktrans with site_name=current_site.name site_domain=current_site.domain %} +Hello from {{ site_name }}!

You're receiving this e-mail because user {{ user_display }} has given yours as an e-mail address @@ -7,6 +8,7 @@ site_name=current_site.name site_domain=current_site.domain %}Hello from {{ site

To confirm this is correct, go to {{ activate_url }}

-{% endblocktrans %} {% blocktrans with site_name=current_site.name site_domain=current_site.domain %} +{% endblocktrans %} +{% blocktrans with site_name=current_site.name site_domain=current_site.domain %} {{ site_domain }} {% endblocktrans %} {% endautoescape %} diff --git a/cvat/apps/authentication/templates/authentication/password_reset_email.html b/cvat/apps/authentication/templates/authentication/password_reset_email.html index e2c68db1..fa3eef8b 100644 --- a/cvat/apps/authentication/templates/authentication/password_reset_email.html +++ b/cvat/apps/authentication/templates/authentication/password_reset_email.html @@ -1,5 +1,16 @@ -{% load i18n %}{% autoescape off %} {% blocktrans %}You're receiving this email because you requested a password reset -for your user account at {{ site_name }}.{% endblocktrans %} {% trans "Please go to the following page and choose a new -password:" %} {% block reset_link %} {{ protocol }}://{{ domain }}/auth/password/reset/confirm?uid={{ uid }}&token={{ -token }} {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} {% trans "Thanks -for using our site!" %} {% blocktrans %}The {{ site_name }} team{% endblocktrans %} {% endautoescape %} +{% load i18n %}{% autoescape off %} +{% blocktrans %} +You're receiving this email because you requested a password reset for your user account at {{ site_name }}. +{% endblocktrans %} + +{% trans "Please go to the following page and choose a new password:" %} +{% block reset_link %} +{{ protocol }}://{{ domain }}/auth/password/reset/confirm?uid={{ uid }}&token={{ token }} +{% endblock %} +{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} + +{% trans "Thanks for using our site!" %} + +{% blocktrans %}The {{ site_name }} team{% endblocktrans %} + +{% endautoescape %} diff --git a/cvat/apps/documentation/templates/documentation/base_page.html b/cvat/apps/documentation/templates/documentation/base_page.html index be127111..90398555 100644 --- a/cvat/apps/documentation/templates/documentation/base_page.html +++ b/cvat/apps/documentation/templates/documentation/base_page.html @@ -15,8 +15,7 @@ -