From 2cbb2e5136624136e7c9c184c5103132914a9dca Mon Sep 17 00:00:00 2001 From: Gray Advantage Date: Thu, 11 Apr 2024 16:15:54 +0300 Subject: [PATCH 1/3] fix: change clone link in README to github repository --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be315dd..271337c 100644 --- 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 ``` ### Установка виртуального окружения From 68cc7b379553df348cf8944878bed3b5dd8049e8 Mon Sep 17 00:00:00 2001 From: Gray Advantage Date: Thu, 11 Apr 2024 19:41:57 +0300 Subject: [PATCH 2/3] fix: change link to github repository in about page --- .github/workflows/python-app.yml | 2 +- datanar/locale/en/LC_MESSAGES/django.po | 18 +++++++++--------- datanar/locale/ru/LC_MESSAGES/django.po | 18 +++++++++--------- datanar/locale/uk/LC_MESSAGES/django.po | 18 +++++++++--------- datanar/static_dev/img/gitlab-logo.jpg | Bin 949 -> 0 bytes datanar/templates/homepage/about.html | 4 +--- 6 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 datanar/static_dev/img/gitlab-logo.jpg diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 99854a3..aa4514a 100644 --- 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/datanar/locale/en/LC_MESSAGES/django.po b/datanar/locale/en/LC_MESSAGES/django.po index a16d329..0eda787 100644 --- 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 \n" "Language-Team: LANGUAGE \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 index ea379a6..c413e49 100644 --- 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 \n" "Language-Team: LANGUAGE \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 index e72947c..139f15f 100644 --- 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 \n" "Language-Team: LANGUAGE \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 deleted file mode 100644 index e65f9f90b3c84d6fed89a1e5fce5a3385734985e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 949 zcmV;m14{gfP)wG{7q zfE1-wstEN$6!FBO4?=Cdqrs|}ctF8_z!wkjz%$WG)tuWTZIgJ^wi=pAGBO({ZjWeV z{lV{Te&5f`>>&t4iduyU!ao)@3lsmiz-@&y+Dhebk)`IMLc`x%@$@$(xbI^nEY1&D zWLsOQOhe_SRfPiXQrze+#k8YbuFkvY*+SIG0If{9St#(l1O^$Pl__`f9`VsaM0G$_ zdIQ#3lSdo=v=SCSUH~&$!1TRq(cCG+7QMEhrbi2)4s@sr4VIghj23WPPy?IQuSivB zNR?L)TlAs?X+}U(O;<+?yeL5)BcQ3utr3rC1UgjH*S58DCjB+sY%b!nzX4O@N9^Vz-)WHc?*Iu;4WRKYkfyd{y_4JUrzgL5$D8jk zyGteQs{v^?$2z)M%FZ4{Z;1oPXzQFwLd+%|@H7L;5MLcg8v)ksm9Q@#5Lt~qJe&h$ zH;xep>Pk5=B~Dl&gwBiY3}78>28sAqDP;scZ@`{>K)6`_ zgA@l?$4*H;Bap1e(UAa6RWkmKAT{U&hhcz+>wp7AgwRLV|Z{c=&<*`TM{SZl2iPGc*HJ&&hrJw#S7YxmphgVwaQ{|7yv-mJ z{RI#wPNbajPD+JwxmPuQ2`meq0SN}^i>@O-*@=1?Fi?-Wh5~_Fk+5*@CXfjSf&-B%+0S>cHG*D#`lt;&r;ZVR zbVG|cQ5A8Z&pL7v-)BIy8u>X8u8}l7{D|1Yg4y+S+Qf50Aw_RXGgA)ykT?(_hp{VJ zk3t*>)PiJiyO{8@SNja;kJ)Ei3kuI6t-^TXL`T_&Lw2JscNrWAuaGtNLHbUK>BxD} z#r_1sSS#s-^OG(3ZudGA2-iw}tx5dSc|qDU=3rydR&nZ=U2;q05WE+=D5C!wK9>3k Xc=_Q05uMe#00000NkvXXu0mjfX`8Fp diff --git a/datanar/templates/homepage/about.html b/datanar/templates/homepage/about.html index 7a901d8..4d7adb7 100644 --- a/datanar/templates/homepage/about.html +++ b/datanar/templates/homepage/about.html @@ -69,8 +69,6 @@
{% trans "developers" %}
- - gitlab{% trans "gitlab_project" %} - + {% trans "github_project" %}
{% endblock %} \ No newline at end of file From 20bd2b7292ddcffa0b5243d0df1aa6eb420a1aaf Mon Sep 17 00:00:00 2001 From: Gray Advantage Date: Thu, 11 Apr 2024 19:44:47 +0300 Subject: [PATCH 3/3] chore: version update --- datanar/datanar/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datanar/datanar/settings.py b/datanar/datanar/settings.py index 324f4df..7d2caf3 100644 --- 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",