Merge branch 'dev' into sergey

Gray-Advantage · Jun 22, 2024 · 404f2df · 404f2df
2 parents e9b8080 + b564548
commit 404f2df
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@
 
 Если у вас его еще нет, вы можете скачать его с официального 
 [сайта](https://www.python.org/downloads/), рекомендуется установить версию в 
-диапазоне 3.9 - 3.11
+диапазоне 3.9 - 3.12
 
 ### Установка Git
 

diff --git a/datanar/locale/bg/LC_MESSAGES/django.po b/datanar/locale/bg/LC_MESSAGES/django.po
@@ -183,7 +183,7 @@ msgstr "пренасочване"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "Паролата не е верна"
+msgstr "Невалидна парола"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/locale/de/LC_MESSAGES/django.po b/datanar/locale/de/LC_MESSAGES/django.po
@@ -190,7 +190,7 @@ msgstr "Weiterleitung"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "Passwort ist nicht korrekt"
+msgstr "Falsches Passwort"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/locale/en/LC_MESSAGES/django.po b/datanar/locale/en/LC_MESSAGES/django.po
@@ -181,7 +181,7 @@ msgstr "redirect"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "The password is incorrect"
+msgstr "Incorrect password"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/locale/es/LC_MESSAGES/django.po b/datanar/locale/es/LC_MESSAGES/django.po
@@ -182,7 +182,7 @@ msgstr "redirección"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "La contraseña no es correcta"
+msgstr "Contraseña incorrecta"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/locale/fr/LC_MESSAGES/django.po b/datanar/locale/fr/LC_MESSAGES/django.po
@@ -182,7 +182,7 @@ msgstr "redirection"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "Le mot de passe est incorrect"
+msgstr "Mot de passe incorrect"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/locale/ja/LC_MESSAGES/django.po b/datanar/locale/ja/LC_MESSAGES/django.po
@@ -181,7 +181,7 @@ msgstr "リダイレクト"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "パスワードが間違っています"
+msgstr "無効なパスワード"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/locale/ru/LC_MESSAGES/django.po b/datanar/locale/ru/LC_MESSAGES/django.po
@@ -187,7 +187,7 @@ msgstr "перенаправление"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "Пароль не верный"
+msgstr "Неверный пароль"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/locale/uk/LC_MESSAGES/django.po b/datanar/locale/uk/LC_MESSAGES/django.po
@@ -187,7 +187,7 @@ msgstr "перенапрямок"
 
 #: .\redirects\views.py:48
 msgid "invalid_password"
-msgstr "Пароль не вірний"
+msgstr "Невірний пароль"
 
 #: .\statistic\apps.py:9 .\templates\includes\link_card.html:13
 msgid "statistic"

diff --git a/datanar/static_dev/css/api/style.css b/datanar/static_dev/css/api/style.css
@@ -84,13 +84,11 @@ pre.example {
 }
 
 .param {
-    width: 500px;
     padding: 10px 0 0 20px;
     font-weight: bold;
 }
 
 .param-desc {
-    width: 700px;
     padding: 0 0 0 20px;
     color: #777;
 }

diff --git a/datanar/templates/api/api_docs.html b/datanar/templates/api/api_docs.html
@@ -92,6 +92,9 @@ <h3 class="field-label">Responses</h3>
   <h4 class="field-label">200</h4>
   Successful operation
   <a href="#Redirect">Redirect</a>
+  <h4 class="field-label">400</h4>
+  Bad request
+  <a href="#"></a>
   <h4 class="field-label">401</h4>
   Invalid token supplied
   <a href="#"></a>
@@ -219,7 +222,7 @@ <h3 class="field-label">Produces</h3>
   </ul>
 
   <h3 class="field-label">Responses</h3>
-  <h4 class="field-label">200</h4>
+  <h4 class="field-label">201</h4>
   Successful operation
   <a href="#Redirect">Redirect</a>
   <h4 class="field-label">400</h4>

diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -5,14 +5,14 @@ django-cleanup==8.1.0
 django-user-agents==0.4.0
 django-settings-export==1.2.1
 django-tz-detect==0.5.0
-djangorestframework==3.15.1
+djangorestframework==3.15.2
 geoip2==4.8.0
 gunicorn==22.0.0
 openpyxl==3.1.3
 pillow==10.3.0
 psycopg2-binary==2.9.9
 python-decouple==3.8
-redis==5.0.1
+redis==5.0.6
 segno==1.6.1
 sorl-thumbnail==12.10.0
 sqids==0.4.1