Add djade to dev tools & format the templates

egorsmkv · egorsmkv · commit 7eb081c2688a · 2024-10-09T15:00:36.000+03:00
diff --git a/README.md b/README.md
@@ -93,3 +93,18 @@ Collect static files:
 ```bash
 python source/manage.py collectstatic
 ```
+
+### Development
+
+#### Check & format code
+
+```bash
+ruff check
+ruff format
+```
+
+### Format templates
+
+```bash
+git ls-files -z -- '*.html' | xargs -0 djade --target-version '5.1'
+```
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1 +1,2 @@
 ruff
+djade
diff --git a/source/accounts/templates/accounts/emails/activate_profile.html b/source/accounts/templates/accounts/emails/activate_profile.html
@@ -12,7 +12,7 @@
 <body>
 
 <p>
-    {% trans 'To activate your profile, please follow this link:' %}
+    {% translate 'To activate your profile, please follow this link:' %}
 </p>
 
 <p>
diff --git a/source/accounts/templates/accounts/emails/change_email.html b/source/accounts/templates/accounts/emails/change_email.html
@@ -12,7 +12,7 @@
 <body>
 
 <p>
-    {% trans 'To change your current email address, please follow the link:' %}
+    {% translate 'To change your current email address, please follow the link:' %}
 </p>
 
 <p>
diff --git a/source/accounts/templates/accounts/emails/forgotten_username.html b/source/accounts/templates/accounts/emails/forgotten_username.html
@@ -12,7 +12,7 @@
 <body>
 
 <p>
-    {% trans 'Your username is:' %}
+    {% translate 'Your username is:' %}
 </p>
 
 <p>
diff --git a/source/accounts/templates/accounts/emails/restore_password_email.html b/source/accounts/templates/accounts/emails/restore_password_email.html
@@ -12,11 +12,11 @@
 <body>
 
 <p>
-    {% trans 'You received this email because you requested a password reset for your user account.' %}
+    {% translate 'You received this email because you requested a password reset for your user account.' %}
 </p>
 
 <p>
-    {% trans 'Please, go to the following page and choose a new password:' %}
+    {% translate 'Please, go to the following page and choose a new password:' %}
 </p>
 
 <p>
diff --git a/source/accounts/templates/accounts/log_in.html b/source/accounts/templates/accounts/log_in.html
@@ -1,33 +1,32 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Log in' %}</h4>
+    <h4>{% translate 'Log in' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-primary">{% trans 'Log in' %}</button>
+        <button class="btn btn-primary">{% translate 'Log in' %}</button>
 
     </form>
 
     <hr>
 
     <ul>
         <li>
-            <a href="{% url 'accounts:restore_password' %}">{% trans 'Forgot your password?' %}</a>
+            <a href="{% url 'accounts:restore_password' %}">{% translate 'Forgot your password?' %}</a>
         </li>
         <li>
-            <a href="{% url 'accounts:remind_username' %}">{% trans 'Forgot your username?' %}</a>
+            <a href="{% url 'accounts:remind_username' %}">{% translate 'Forgot your username?' %}</a>
         </li>
         <li>
-            <a href="{% url 'accounts:resend_activation_code' %}">{% trans 'Resend an activation code' %}</a>
+            <a href="{% url 'accounts:resend_activation_code' %}">{% translate 'Resend an activation code' %}</a>
         </li>
     </ul>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/log_out.html b/source/accounts/templates/accounts/log_out.html
@@ -4,14 +4,14 @@
 
 {% block content %}
 
-    <h4>{% trans 'Logged out' %}</h4>
+    <h4>{% translate 'Logged out' %}</h4>
 
     <p>
-        {% trans 'Thanks for spending some quality time with the site today.' %}
+        {% translate 'Thanks for spending some quality time with the site today.' %}
     </p>
 
     <p>
-        <a href="{% url 'accounts:log_in' %}">{% trans 'Log in again' %}</a>
+        <a href="{% url 'accounts:log_in' %}">{% translate 'Log in again' %}</a>
     </p>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/log_out_confirm.html b/source/accounts/templates/accounts/log_out_confirm.html
@@ -4,15 +4,15 @@
 
 {% block content %}
 
-    <h4>{% trans 'Log out' %}</h4>
+    <h4>{% translate 'Log out' %}</h4>
 
     <p>
-        {% trans 'Confirm this action:' %}
+        {% translate 'Confirm this action:' %}
     </p>
 
     <form action="{% url 'accounts:log_out' %}" method="post">
         {% csrf_token %}
-        <button class="btn btn-success">{% trans 'Log out' %}</button>
+        <button class="btn btn-success">{% translate 'Log out' %}</button>
     </form>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/profile/change_email.html b/source/accounts/templates/accounts/profile/change_email.html
@@ -1,19 +1,18 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Change email' %}</h4>
+    <h4>{% translate 'Change email' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-success">{% trans 'Change' %}</button>
+        <button class="btn btn-success">{% translate 'Change' %}</button>
 
     </form>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/profile/change_password.html b/source/accounts/templates/accounts/profile/change_password.html
@@ -1,19 +1,18 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Change password' %}</h4>
+    <h4>{% translate 'Change password' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-success">{% trans 'Change' %}</button>
+        <button class="btn btn-success">{% translate 'Change' %}</button>
 
     </form>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/profile/change_profile.html b/source/accounts/templates/accounts/profile/change_profile.html
@@ -1,19 +1,18 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Change profile' %}</h4>
+    <h4>{% translate 'Change profile' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-success">{% trans 'Change' %}</button>
+        <button class="btn btn-success">{% translate 'Change' %}</button>
 
     </form>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/remind_username.html b/source/accounts/templates/accounts/remind_username.html
@@ -1,27 +1,26 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Remind a username' %}</h4>
+    <h4>{% translate 'Remind a username' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-primary">{% trans 'Next' %}</button>
+        <button class="btn btn-primary">{% translate 'Next' %}</button>
 
     </form>
 
     <hr>
 
     <ul>
         <li>
-            <a href="{% url 'accounts:log_in' %}">{% trans 'Log in' %}</a>
+            <a href="{% url 'accounts:log_in' %}">{% translate 'Log in' %}</a>
         </li>
     </ul>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/resend_activation_code.html b/source/accounts/templates/accounts/resend_activation_code.html
@@ -1,27 +1,26 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Resend an activation code' %}</h4>
+    <h4>{% translate 'Resend an activation code' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-primary">{% trans 'Next' %}</button>
+        <button class="btn btn-primary">{% translate 'Next' %}</button>
 
     </form>
 
     <hr>
 
     <ul>
         <li>
-            <a href="{% url 'accounts:log_in' %}">{% trans 'Log in' %}</a>
+            <a href="{% url 'accounts:log_in' %}">{% translate 'Log in' %}</a>
         </li>
     </ul>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/restore_password.html b/source/accounts/templates/accounts/restore_password.html
@@ -1,27 +1,26 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Restore password' %}</h4>
+    <h4>{% translate 'Restore password' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-primary">{% trans 'Next' %}</button>
+        <button class="btn btn-primary">{% translate 'Next' %}</button>
 
     </form>
 
     <hr>
 
     <ul>
         <li>
-            <a href="{% url 'accounts:log_in' %}">{% trans 'Log in' %}</a>
+            <a href="{% url 'accounts:log_in' %}">{% translate 'Log in' %}</a>
         </li>
     </ul>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/restore_password_confirm.html b/source/accounts/templates/accounts/restore_password_confirm.html
@@ -1,33 +1,32 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Restore password' %}</h4>
+    <h4>{% translate 'Restore password' %}</h4>
 
     {% if validlink %}
 
         <p>
-            {% trans 'Please enter your new password twice so we can verify you typed it in correctly.' %}
+            {% translate 'Please enter your new password twice so we can verify you typed it in correctly.' %}
         </p>
 
         <form method="post">
 
             {% csrf_token %}
             {% bootstrap_form form %}
 
-            <button class="btn btn-success">{% trans 'Change' %}</button>
+            <button class="btn btn-success">{% translate 'Change' %}</button>
 
         </form>
 
     {% else %}
 
         <div class="alert alert-danger">
-            {% trans 'The password reset link was invalid, possibly because it has already been used. Please request a new password reset.' %}
+            {% translate 'The password reset link was invalid, possibly because it has already been used. Please request a new password reset.' %}
         </div>
 
     {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/restore_password_done.html b/source/accounts/templates/accounts/restore_password_done.html
@@ -4,15 +4,15 @@
 
 {% block content %}
 
-    <h4>{% trans 'Restore password' %}</h4>
+    <h4>{% translate 'Restore password' %}</h4>
 
     <div>
-        {% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered." %}
-        {% trans 'You should receive them shortly.' %}
+        {% translate "We've emailed you instructions for setting your password, if an account exists with the email you entered." %}
+        {% translate 'You should receive them shortly.' %}
 
         <br>
 
-        {% trans "If you don't receive an email, please make sure you've entered the address you signed up with, and check your spam folder." %}
+        {% translate "If you don't receive an email, please make sure you've entered the address you signed up with, and check your spam folder." %}
     </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/accounts/templates/accounts/sign_up.html b/source/accounts/templates/accounts/sign_up.html
@@ -1,19 +1,18 @@
 {% extends 'layouts/default/page.html' %}
 
-{% load bootstrap4 %}
-{% load i18n %}
+{% load bootstrap4 i18n %}
 
 {% block content %}
 
-    <h4>{% trans 'Create an account' %}</h4>
+    <h4>{% translate 'Create an account' %}</h4>
 
     <form method="post">
 
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <button class="btn btn-success">{% trans 'Create' %}</button>
+        <button class="btn btn-success">{% translate 'Create' %}</button>
 
     </form>
 
-{% endblock %}
+{% endblock content %}
diff --git a/source/content/templates/layouts/default/page.html b/source/content/templates/layouts/default/page.html
diff --git a/source/content/templates/main/change_language.html b/source/content/templates/main/change_language.html
diff --git a/source/content/templates/main/index.html b/source/content/templates/main/index.html
