Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sergey #7

Merged
merged 3 commits into from
Apr 11, 2024
Merged

Sergey #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cbb2e5
fix: change clone link in README to github repository
Gray-Advantage Apr 11, 2024
68cc7b3
fix: change link to github repository in about page
Gray-Advantage Apr 11, 2024
20bd2b7
chore: version update
Gray-Advantage Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ jobs:
source venv/bin/activate
pip install -r requirements/dev.txt
cd ~/datanar/datanar
python manage.py makemigrations
python manage.py migrate
python manage.py compilemessages
python manage.py collectstatic --no-input
deactivate
cd ~
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ gettext для windows
`cd ~/myProject/sites`
3. Клонируйте репозиторий, используя следующую команду:
```bash
git clone https://gitlab.crja72.ru/django_2023/projects/datanar.git
git clone https://github.com/Gray-Advantage/Datanar-Django.git
```

### Установка виртуального окружения
Expand Down
2 changes: 1 addition & 1 deletion datanar/datanar/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

BASE_DIR = Path(__file__).resolve().parent.parent

VERSION = "1.5.1"
VERSION = "1.5.2"

SECRET_KEY = config(
"DJANGO_SECRET_KEY",
Expand Down
18 changes: 9 additions & 9 deletions datanar/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
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-12-28 08:07+0300\n"
"POT-Creation-Date: 2024-04-11 17:45+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -26,15 +26,15 @@ msgstr "API"
msgid "base_forms"
msgstr "Base forms"

#: .\datanar\settings.py:162
#: .\datanar\settings.py:177
msgid "English"
msgstr "English"

#: .\datanar\settings.py:163
#: .\datanar\settings.py:178
msgid "Russian"
msgstr "Русский"

#: .\datanar\settings.py:164
#: .\datanar\settings.py:179
msgid "Ukrainian"
msgstr "Український"

Expand Down Expand Up @@ -138,7 +138,7 @@ msgstr "redirect"
msgid "invalid_password"
msgstr "The password is incorrect"

#: .\statistic\apps.py:9 .\templates\includes\link_card.html:14
#: .\statistic\apps.py:9 .\templates\includes\link_card.html:16
msgid "statistic"
msgstr "Statistics"

Expand Down Expand Up @@ -388,9 +388,9 @@ msgstr "Klimenko Vladimir"
msgid "artem"
msgstr "Tretyakov Artem"

#: .\templates\homepage\about.html:73
msgid "gitlab_project"
msgstr "GitLab Project"
#: .\templates\homepage\about.html:72
msgid "github_project"
msgstr "Github Project"

#: .\templates\homepage\main.html:5
msgid "title__homepage"
Expand Down Expand Up @@ -527,7 +527,7 @@ msgstr "Sign in"
msgid "registration"
msgstr "Registration"

#: .\templates\includes\link_card.html:12
#: .\templates\includes\link_card.html:13
msgid "copy"
msgstr "Copy"

Expand Down
18 changes: 9 additions & 9 deletions datanar/locale/ru/LC_MESSAGES/django.po
View file
Open in desktop
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-12-28 08:07+0300\n"
"POT-Creation-Date: 2024-04-11 17:45+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -28,15 +28,15 @@ msgstr "API"
msgid "base_forms"
msgstr "Базовые формы"

#: .\datanar\settings.py:162
#: .\datanar\settings.py:177
msgid "English"
msgstr "English"

#: .\datanar\settings.py:163
#: .\datanar\settings.py:178
msgid "Russian"
msgstr "Русский"

#: .\datanar\settings.py:164
#: .\datanar\settings.py:179
msgid "Ukrainian"
msgstr "Український"

Expand Down Expand Up @@ -145,7 +145,7 @@ msgstr "перенаправление"
msgid "invalid_password"
msgstr "Пароль не верный"

#: .\statistic\apps.py:9 .\templates\includes\link_card.html:14
#: .\statistic\apps.py:9 .\templates\includes\link_card.html:16
msgid "statistic"
msgstr "Статистика"

Expand Down Expand Up @@ -395,9 +395,9 @@ msgstr "Клименко Владимир"
msgid "artem"
msgstr "Третьяков Артем"

#: .\templates\homepage\about.html:73
msgid "gitlab_project"
msgstr "Проект на GitLab"
#: .\templates\homepage\about.html:72
msgid "github_project"
msgstr "Проект на Github"

#: .\templates\homepage\main.html:5
msgid "title__homepage"
Expand Down Expand Up @@ -537,7 +537,7 @@ msgstr "Войти"
msgid "registration"
msgstr "Регистрация"

#: .\templates\includes\link_card.html:12
#: .\templates\includes\link_card.html:13
msgid "copy"
msgstr "Скопировать"

Expand Down
18 changes: 9 additions & 9 deletions datanar/locale/uk/LC_MESSAGES/django.po
View file
Open in desktop
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-12-28 08:07+0300\n"
"POT-Creation-Date: 2024-04-11 17:45+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -29,15 +29,15 @@ msgstr "API"
msgid "base_forms"
msgstr "Базові форми"

#: .\datanar\settings.py:162
#: .\datanar\settings.py:177
msgid "English"
msgstr "English"

#: .\datanar\settings.py:163
#: .\datanar\settings.py:178
msgid "Russian"
msgstr "Русский"

#: .\datanar\settings.py:164
#: .\datanar\settings.py:179
msgid "Ukrainian"
msgstr "Український"

Expand Down Expand Up @@ -145,7 +145,7 @@ msgstr "перенапрямок"
msgid "invalid_password"
msgstr "Пароль не вірний"

#: .\statistic\apps.py:9 .\templates\includes\link_card.html:14
#: .\statistic\apps.py:9 .\templates\includes\link_card.html:16
msgid "statistic"
msgstr "Статистика"

Expand Down Expand Up @@ -394,9 +394,9 @@ msgstr "Клименко Володимир"
msgid "artem"
msgstr "Третьяков Артем"

#: .\templates\homepage\about.html:73
msgid "gitlab_project"
msgstr "Проект на GitLab"
#: .\templates\homepage\about.html:72
msgid "github_project"
msgstr "Проект на Github"

#: .\templates\homepage\main.html:5
msgid "title__homepage"
Expand Down Expand Up @@ -536,7 +536,7 @@ msgstr "Увійти"
msgid "registration"
msgstr "Реєстрація"

#: .\templates\includes\link_card.html:12
#: .\templates\includes\link_card.html:13
msgid "copy"
msgstr "Копіювати"

Expand Down
Binary file removed datanar/static_dev/img/gitlab-logo.jpg
View file
Open in desktop
Binary file not shown.
4 changes: 1 addition & 3 deletions datanar/templates/homepage/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ <h5 class="text-center mt-5">{% trans "developers" %}</h5>
</div>

<div class="text-center font-20 mt-5 mb-3">
<a href="https://gitlab.crja72.ru/django_2023/projects/datanar">
<img src="{% static 'img/gitlab-logo.jpg' %}" alt="gitlab" class="me-2">{% trans "gitlab_project" %}
</a>
<i class="bi bi-github" style="font-size: 24px"></i> <a href="https://github.com/Gray-Advantage/Datanar-Django">{% trans "github_project" %}</a>
</div>
{% endblock %}
Loading