Skip to content

Commit

Permalink
Remove Hexlet from index page
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey-Volkovitskiy committed Jan 22, 2024
1 parent cf97f18 commit 47f8a93
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 44 deletions.
Binary file modified locale/ru/LC_MESSAGES/django.mo
Binary file not shown.
87 changes: 49 additions & 38 deletions locale/ru/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-16 16:46+0600\n"
"POT-Creation-Date: 2024-01-22 11:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -27,49 +27,49 @@ msgstr ""
msgid "Name"
msgstr "Имя"

#: task_manager/labels/views.py:21 task_manager/statuses/views.py:22
#: task_manager/tasks/views.py:24 task_manager/tasks/views.py:53
#: task_manager/users/views.py:53
#: task_manager/labels/views.py:20 task_manager/statuses/views.py:20
#: task_manager/tasks/views.py:23 task_manager/tasks/views.py:28
#: task_manager/users/views.py:37
msgid "You are not authorized! Please sign in."
msgstr "Вы не авторизованы! Пожалуйста, выполните вход."

#: task_manager/labels/views.py:39
#: task_manager/labels/views.py:36
msgid "Label successfully created"
msgstr "Метка успешно создана"

#: task_manager/labels/views.py:50
#: task_manager/labels/views.py:47
msgid "Label successfully updated"
msgstr "Метка успешно изменена"

#: task_manager/labels/views.py:61
#: task_manager/labels/views.py:58
msgid "Label successfully deleted"
msgstr "Метка успешно удалена"

#: task_manager/labels/views.py:69
#: task_manager/labels/views.py:66 task_manager/labels/views.py:82
msgid "The label cannot be deleted because it is in use"
msgstr "Невозможно удалить метку, потому что она используется"

#: task_manager/settings.py:130
#: task_manager/settings.py:133
msgid "English"
msgstr ""

#: task_manager/settings.py:131
#: task_manager/settings.py:134
msgid "Russian"
msgstr ""

#: task_manager/statuses/views.py:40
#: task_manager/statuses/views.py:36
msgid "Status successfully created"
msgstr "Статус успешно создан"

#: task_manager/statuses/views.py:51
#: task_manager/statuses/views.py:47
msgid "Status successfully updated"
msgstr "Статус успешно изменен"

#: task_manager/statuses/views.py:62
#: task_manager/statuses/views.py:58
msgid "Status successfully deleted"
msgstr "Статус успешно удален"

#: task_manager/statuses/views.py:71
#: task_manager/statuses/views.py:66 task_manager/statuses/views.py:82
msgid "The status cannot be deleted because it is in use"
msgstr "Невозможно удалить статус, потому что он используется"

Expand Down Expand Up @@ -116,19 +116,19 @@ msgstr "Метки"
msgid "Created at"
msgstr "Дата создания"

#: task_manager/tasks/views.py:45
#: task_manager/tasks/views.py:44
msgid "The task can only be deleted by its author."
msgstr "Задачу может удалить только её автор"

#: task_manager/tasks/views.py:82
#: task_manager/tasks/views.py:66
msgid "Task successfully created"
msgstr "Задача успешно создана"

#: task_manager/tasks/views.py:94
#: task_manager/tasks/views.py:89
msgid "Task successfully updated"
msgstr "Задача успешно изменена"

#: task_manager/tasks/views.py:105
#: task_manager/tasks/views.py:100
msgid "Task successfully deleted"
msgstr "Задача успешно удалена"

Expand Down Expand Up @@ -167,16 +167,18 @@ msgid "Sign Up"
msgstr "Регистрация"

#: task_manager/templates/index.html:13
msgid "Hello from Hexlet!"
msgstr "Привет от Хекслета!"
msgid "Task Manager"
msgstr "Менеджер задач"

#: task_manager/templates/index.html:14
msgid "Practical programming courses"
msgstr "Практические курсы по программированию"
msgid ""
"Log in as a user, manage statuses, track your tasks and search for them by "
"labels."
msgstr "Авторизуйтесь как пользователь, управляйте статусами, отслеживайте свои задачи и ищите их с помощью меток."

#: task_manager/templates/index.html:16
msgid "Learn more"
msgstr "Узнать больше"
msgid "Start"
msgstr "Начать"

#: task_manager/templates/labels/create.html:7
#: task_manager/templates/labels/create.html:11
Expand Down Expand Up @@ -322,48 +324,48 @@ msgstr "Полное имя"
msgid "Edit user"
msgstr "Изменение пользователя"

#: task_manager/users/forms.py:17
#: task_manager/users/forms.py:18
msgid "Password"
msgstr "Пароль"

#: task_manager/users/forms.py:18
#: task_manager/users/forms.py:19 task_manager/users/serializers.py:45
msgid "Your password must contain at least 3 characters."
msgstr "Ваш пароль должен содержать как минимум 3 символа."

#: task_manager/users/forms.py:23
msgid "Your password is too short. It must contain at least 3 characters."
msgstr ""
"Введённый пароль слишком короткий. Он должен содержать как минимум 3 символа."

#: task_manager/users/forms.py:30
msgid "Confirm password"
msgstr "Подтверждение пароля"

#: task_manager/users/forms.py:24
#: task_manager/users/forms.py:31
msgid "Please enter your password one more time"
msgstr "Для подтверждения введите, пожалуйста, пароль ещё раз."

#: task_manager/users/forms.py:32
msgid "Your password is too short. It must contain at least 3 characters."
msgstr ""
"Введённый пароль слишком короткий. Он должен содержать как минимум 3 символа."

#: task_manager/users/forms.py:39
#: task_manager/users/forms.py:40
msgid "The entered passwords do not match."
msgstr "Введенные пароли не совпадают."

#: task_manager/users/views.py:27
#: task_manager/users/views.py:32
msgid "User successfully created"
msgstr "Пользователь успешно зарегистрирован"

#: task_manager/users/views.py:45
#: task_manager/users/views.py:52
msgid "You do not have rights to change another user."
msgstr "У вас нет прав для изменения другого пользователя."

#: task_manager/users/views.py:67
#: task_manager/users/views.py:66
msgid "User successfully updated"
msgstr "Пользователь успешно изменен"

#: task_manager/users/views.py:79
#: task_manager/users/views.py:77
msgid "User successfully deleted"
msgstr "Пользователь успешно удален"

#: task_manager/users/views.py:88
#: task_manager/users/views.py:87 task_manager/users/views.py:106
msgid "The user cannot be deleted because it is in use"
msgstr "Невозможно удалить пользователя, потому что он используется"

Expand All @@ -374,3 +376,12 @@ msgstr "Вы залогинены"
#: task_manager/views.py:22
msgid "You are logged out"
msgstr "Вы разлогинены"

#~ msgid "Hello from Hexlet!"
#~ msgstr "Привет от Хекслета!"

#~ msgid "Practical programming courses"
#~ msgstr "Практические курсы по программированию"

#~ msgid "Learn more"
#~ msgstr "Узнать больше"
2 changes: 1 addition & 1 deletion task_manager/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<footer>
<div class="container my-5 pt-4 border-top">
<a target="_blank" href="https://ru.hexlet.io">Hexlet</a>
© 2023 <a target="_blank" href="https://ru.hexlet.io">Hexlet</a>, Andrey Volkovitskiy
</div>
</footer>

Expand Down
6 changes: 3 additions & 3 deletions task_manager/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
{% block content %}
<div class="card">
<div class="card-body p-5 bg-light">
<div class="display-4">{% translate "Hello from Hexlet!" %}</div>
<p class="lead">{% translate "Practical programming courses" %}</p>
<div class="display-4">{% translate "Task Manager" %}</div>
<p class="lead my-2">{% translate "Log in as a user, manage statuses, track your tasks and search for them by labels." %}</p>
<hr>
<a class="btn btn-primary btn-lg" href="https://ru.hexlet.io">{% translate "Learn more" %}</a>
<a class="btn btn-primary btn-lg" href="{% url 'user-create' %}">{% translate "Start" %}</a>
</div>
</div>
{% endblock %}
5 changes: 3 additions & 2 deletions tests/test_home_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ def test_basic_content(client):
responce = client.get(TESTED_URL)
content = responce.content.decode()
assert responce.status_code == 200
assert "Практические курсы по программированию" in content
assert "Узнать больше" in content
assert ("Авторизуйтесь как пользователь, управляйте статусами, "
"отслеживайте свои задачи и ищите их с помощью меток") in content
assert "Начать" in content
assert "Пользователи" in content
assert "Вход" in content
assert "Регистрация" in content
Expand Down

0 comments on commit 47f8a93

Please sign in to comment.