Merge pull request #7 from Gray-Advantage/sergey

Sergey
Gray-Advantage · Apr 11, 2024 · cca96c0 · cca96c0
2 parents f071d26 + 20bd2b7
commit cca96c0
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 33 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -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 ~

diff --git a/README.md b/README.md
@@ -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
     ```
 
 ### Установка виртуального окружения

diff --git a/datanar/datanar/settings.py b/datanar/datanar/settings.py
@@ -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",

diff --git a/datanar/locale/en/LC_MESSAGES/django.po b/datanar/locale/en/LC_MESSAGES/django.po
@@ -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"
@@ -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 "Український"
 
@@ -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"
 
@@ -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"
@@ -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"
 

diff --git a/datanar/locale/ru/LC_MESSAGES/django.po b/datanar/locale/ru/LC_MESSAGES/django.po
@@ -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"
@@ -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 "Український"
 
@@ -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 "Статистика"
 
@@ -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"
@@ -537,7 +537,7 @@ msgstr "Войти"
 msgid "registration"
 msgstr "Регистрация"
 
-#: .\templates\includes\link_card.html:12
+#: .\templates\includes\link_card.html:13
 msgid "copy"
 msgstr "Скопировать"
 

diff --git a/datanar/locale/uk/LC_MESSAGES/django.po b/datanar/locale/uk/LC_MESSAGES/django.po
@@ -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"
@@ -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 "Український"
 
@@ -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 "Статистика"
 
@@ -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"
@@ -536,7 +536,7 @@ msgstr "Увійти"
 msgid "registration"
 msgstr "Реєстрація"
 
-#: .\templates\includes\link_card.html:12
+#: .\templates\includes\link_card.html:13
 msgid "copy"
 msgstr "Копіювати"
 

diff --git a/datanar/static_dev/img/gitlab-logo.jpg b/datanar/static_dev/img/gitlab-logo.jpg
diff --git a/datanar/templates/homepage/about.html b/datanar/templates/homepage/about.html
@@ -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 %}