Merge pull request #190 from mnogom/main

Achievments

.editorconfig

@@ -0,0 +1,18 @@
+[Makefile]
+indent_style = tab
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_style = space
+indent_size = 4

Makefile

@@ -19,8 +19,8 @@ shell:
 
 # Need to have GNU gettext installed
 transprepare:
-	@poetry run django-admin makemessages --add-location file
-	@poetry run django-admin makemessages --add-location file --domain djangojs
+	@poetry run django-admin makemessages --locale ru --add-location file
+	@poetry run django-admin makemessages --locale ru --add-location file --domain djangojs
 
 transcompile:
 	@poetry run django-admin compilemessages

contributors/views/contributor.py

@@ -11,6 +11,7 @@ class DetailView(generic.DetailView):
     model = Contributor
     template_name = 'contributor_details.html'
     slug_field = 'login'
+    queryset = Contributor.objects.with_contributions()
 
     def get_context_data(self, **kwargs):
         """Add additional context for the contributor."""

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: 2020-07-13 16:30+0500\n"
+"POT-Creation-Date: 2022-09-02 19:09+0300\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"
@@ -57,31 +57,21 @@ msgstr "Неверное имя: "
 msgid "Uncheck those you wish to skip."
 msgstr "Снимите выбор тех, что нужно пропустить."
 
-#: contributors/forms/forms.py
-msgid "Sort by"
-msgstr "Сортировка по"
-
-#: contributors/forms/forms.py
-msgid "Descending"
-msgstr "По убыванию"
+#: contributors/forms/forms.py templates/contributor_details.html
+msgid "Filter by name"
+msgstr "Фильтр по имени"
 
 #: contributors/forms/forms.py
 msgid "Search"
 msgstr "Поиск"
 
-#: contributors/forms/forms.py
-msgid "Apply"
-msgstr "Применить"
-
-#: contributors/forms/forms.py
-msgid "Reset"
-msgstr "Сбросить"
-
 #: contributors/models/base.py
 msgid "name"
 msgstr "Имя"
 
 #: contributors/models/base.py contributors/models/contribution.py
+#: templates/components/tables/contributor_issues.html
+#: templates/components/tables/contributor_prs.html
 msgid "URL"
 msgstr ""
 
@@ -162,8 +152,8 @@ msgid "title"
 msgstr "заголовок"
 
 #: contributors/models/issue_info.py
-msgid "open"
-msgstr "открыто"
+msgid "state"
+msgstr ""
 
 #: contributors/models/issue_info.py
 msgid "issue info"
@@ -193,6 +183,10 @@ msgstr "проекты"
 msgid "full name"
 msgstr "полное имя"
 
+#: contributors/models/repository.py
+msgid "labels"
+msgstr ""
+
 #: contributors/models/repository.py
 msgid "repositories"
 msgstr "репозитории"
@@ -201,12 +195,6 @@ msgstr "репозитории"
 msgid "Processing configuration"
 msgstr "Конфигурирование сбора данных"
 
-#: contributors/views/organization.py contributors/views/repositories.py
-#: templates/components/tables/repositories_list.html
-#: templates/project_details.html templates/repository_details.html
-msgid "Project"
-msgstr "Проект"
-
 #: contributors/views/organization.py contributors/views/repositories.py
 #: templates/components/navbar.html
 #: templates/components/tables/repositories_list.html
@@ -221,12 +209,6 @@ msgstr "Контрибьюторы"
 msgid "Repositories"
 msgstr "Репозитории"
 
-#: contributors/views/repositories.py
-#: templates/components/tables/repositories_list.html
-#: templates/repository_details.html
-msgid "Organization"
-msgstr "Организация"
-
 #: templates/admin/configuration.html
 msgid "Get repositories"
 msgstr "Получить репозитории"
@@ -276,9 +258,13 @@ msgstr ""
 msgid "Unknown content"
 msgstr ""
 
-#: templates/components/footer.html
-msgid "Language"
-msgstr "Язык"
+#: templates/base.html
+msgid ""
+"A service to track contributions from members of the Hexlet community to the "
+"Hexlet open-source projects on GitHub"
+msgstr ""
+"Сервис для отслеживания вкладов членов сообщества Hexlet в проекты с "
+"открытым исходным кодов Hexlet на GitHub"
 
 #: templates/components/footer.html
 msgid "Source code"
@@ -320,6 +306,15 @@ msgstr "За всё время"
 msgid "Open Issues"
 msgstr "Проблемы"
 
+#: templates/components/navbar.html
+#: templates/components/tables/contributors_list.html
+#: templates/components/tables/recent_contributors.html
+#: templates/components/tables/repositories_list.html
+#: templates/contributor_details.html templates/contributor_prs.html
+#: templates/projects_list.html templates/pull_requests_list.html
+msgid "Pull requests"
+msgstr "Запросы на включение"
+
 #: templates/components/navbar.html
 msgid "Admin"
 msgstr "Администрирование"
@@ -332,9 +327,9 @@ msgstr "Моя статистика"
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/components/navbar.html
-msgid "Log in with GitHub"
-msgstr "Войти через GitHub"
+#: templates/components/navbar.html templates/registration/login.html
+msgid "Log in"
+msgstr "Войти"
 
 #: templates/components/pagination.html
 msgid "Previous"
@@ -344,6 +339,40 @@ msgstr "Назад"
 msgid "Next"
 msgstr "Далее"
 
+#: templates/components/tables/contributor_issues.html
+#: templates/components/tables/contributor_prs.html
+#: templates/components/tables/pull_requests_list.html
+msgid "Title"
+msgstr "Заголовок"
+
+#: templates/components/tables/contributor_issues.html
+#: templates/components/tables/contributor_prs.html
+#: templates/components/tables/pull_requests_list.html
+#: templates/contributor_details.html templates/repository_details.html
+msgid "Repository"
+msgstr "Репозиторий"
+
+#: templates/components/tables/contributor_issues.html
+#: templates/components/tables/contributor_prs.html
+#: templates/components/tables/pull_requests_list.html
+msgid "Creation date"
+msgstr "Дата создания"
+
+#: templates/components/tables/contributor_issues.html
+#: templates/components/tables/contributor_prs.html
+#: templates/components/tables/pull_requests_list.html
+msgid "Status"
+msgstr "Статус"
+
+#: templates/components/tables/contributor_issues.html
+#: templates/components/tables/contributor_prs.html
+#: templates/components/tables/contributors_list.html
+#: templates/components/tables/organizations_list.html
+#: templates/components/tables/pull_requests_list.html
+#: templates/components/tables/repositories_list.html
+msgid "Nothing found"
+msgstr "Ничего не найдено"
+
 #: templates/components/tables/contributors_list.html
 #: templates/components/tables/recent_contributors.html
 msgid "Login"
@@ -377,14 +406,8 @@ msgstr "Удаления"
 #: templates/components/tables/contributors_list.html
 #: templates/components/tables/recent_contributors.html
 #: templates/components/tables/repositories_list.html
-#: templates/contributor_details.html templates/projects_list.html
-msgid "Pull requests"
-msgstr "Запросы на включение"
-
-#: templates/components/tables/contributors_list.html
-#: templates/components/tables/recent_contributors.html
-#: templates/components/tables/repositories_list.html
-#: templates/contributor_details.html templates/projects_list.html
+#: templates/contributor_details.html templates/contributor_issues.html
+#: templates/projects_list.html
 msgid "Issues"
 msgstr "Проблемы"
 
@@ -394,11 +417,19 @@ msgstr "Проблемы"
 msgid "Comments"
 msgstr "Комментарии"
 
-#: templates/components/tables/contributors_list.html
-#: templates/components/tables/organizations_list.html
+#: templates/components/tables/pull_requests_list.html
+msgid "Author"
+msgstr "Автор"
+
 #: templates/components/tables/repositories_list.html
-msgid "Nothing found"
-msgstr "Ничего не найдено"
+#: templates/repository_details.html
+msgid "Organization"
+msgstr "Организация"
+
+#: templates/components/tables/repositories_list.html
+#: templates/project_details.html templates/repository_details.html
+msgid "Project"
+msgstr "Проект"
 
 #: templates/components/time_note.html
 msgid "since"
@@ -408,6 +439,28 @@ msgstr "с"
 msgid "for the past month"
 msgstr "за прошедший месяц"
 
+#: templates/contributor_details.html
+msgid "Contributor"
+msgstr "Участник"
+
+#: templates/contributor_details.html
+msgid "Achievments"
+msgstr "Достижения"
+
+#: templates/contributor_details.html
+msgid "Hexlet friend"
+msgstr "Друг Хекслета"
+
+#: templates/contributor_details.html
+#, fuzzy
+#| msgid "Issues"
+msgid "Issuess"
+msgstr "Проблемы"
+
+#: templates/contributor_details.html
+msgid "Additions and deletions"
+msgstr "Добавления и удаления"
+
 #: templates/contributor_details.html templates/home.html
 msgid "Past year activity"
 msgstr "Активность за год"
@@ -416,14 +469,13 @@ msgstr "Активность за год"
 msgid "All-time contributions"
 msgstr "Вклад за всё время"
 
-#: templates/contributor_details.html
-msgid "Filter by name"
-msgstr "Фильтр по имени"
+#: templates/contributor_issues.html
+msgid "Issues by"
+msgstr "Issues пользователя"
 
-#: templates/contributor_details.html
-#: templates/components/pull_requests_list.html
-msgid "Repository"
-msgstr "Репозиторий"
+#: templates/contributor_prs.html
+msgid "Pull requests by"
+msgstr "Пулл реквесты пользователя"
 
 #: templates/contributors_for_month.html
 msgid "Contributors for month"
@@ -453,6 +505,10 @@ msgstr "по комментариям"
 msgid "New PRs and issues"
 msgstr "Новые PR и проблемы"
 
+#: templates/organization_details.html
+msgid "Details for organization"
+msgstr "Детали организации"
+
 #: templates/project_details.html
 msgid "Project related repositories"
 msgstr "Связанные с проектом репозитории"
@@ -462,10 +518,6 @@ msgctxt "logon"
 msgid "Login"
 msgstr "Вход"
 
-#: templates/registration/login.html
-msgid "Log in"
-msgstr "Войти"
-
 #: templates/registration/registration.html
 msgid "Registration"
 msgstr "Регистрация"
@@ -474,41 +526,26 @@ msgstr "Регистрация"
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#~ msgid "Recently active contributors"
-#~ msgstr "Недавно активные участники"
+#~ msgid "Sort by"
+#~ msgstr "Сортировка по"
 
-#: templates/base.html
-msgid "A service to track contributions from members of the Hexlet community to the Hexlet open-source projects on GitHub"
-msgstr "Сервис для отслеживания вкладов членов сообщества Hexlet в проекты с открытым исходным кодов Hexlet на GitHub"
-
-#: templates/contributor_details.html
-msgid "Contributor"
-msgstr "Участник"
-
-#: templates/contributor_issues.html
-msgid "Issues by"
-msgstr "Issues пользователя"
+#~ msgid "Descending"
+#~ msgstr "По убыванию"
 
-#: templates/contributor_prs.html
-msgid "Pull requests by"
-msgstr "Пулл реквесты пользователя"
+#~ msgid "Apply"
+#~ msgstr "Применить"
 
-#: templates/organization_details.html
-msgid "Details for organization"
-msgstr "Детали организации"
+#~ msgid "Reset"
+#~ msgstr "Сбросить"
 
-#: templates/components/pull_requests_list.html
-msgid "Author"
-msgstr "Автор"
+#~ msgid "open"
+#~ msgstr "открыто"
 
-#: templates/components/pull_requests_list.html
-msgid "Status"
-msgstr "Статус"
+#~ msgid "Language"
+#~ msgstr "Язык"
 
-#: templates/components/pull_requests_list.html
-msgid "Creation date"
-msgstr "Дата создания"
+#~ msgid "Log in with GitHub"
+#~ msgstr "Войти через GitHub"
 
-#: templates/components/pull_requests_list.html
-msgid "Title"
-msgstr "Заголовок"
+#~ msgid "Recently active contributors"
+#~ msgstr "Недавно активные участники"