diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py +++ b/kallithea/controllers/api/api.py @@ -1266,7 +1266,7 @@ class ApiController(JSONRPCController): repo_copy_permissions=copy_permissions, ) - task = RepoModel().create(form_data=data, cur_user=owner) + task = RepoModel().create(form_data=data, cur_user=owner.username) task_id = task.task_id # no commit, it's done in RepoModel, or async via celery return dict( @@ -1440,7 +1440,7 @@ class ApiController(JSONRPCController): update_after_clone=False, fork_parent_id=repo.repo_id, ) - task = RepoModel().create_fork(form_data, cur_user=owner) + task = RepoModel().create_fork(form_data, cur_user=owner.username) # no commit, it's done in RepoModel, or async via celery task_id = task.task_id return dict( diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po @@ -2044,7 +2044,7 @@ msgid "Build from scratch" msgstr "Von Grund auf neu bauen" msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" "Diese Option führt zu einer vollständigen Neuindizierung aller " diff --git a/kallithea/i18n/el/LC_MESSAGES/kallithea.po b/kallithea/i18n/el/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po @@ -2201,7 +2201,7 @@ msgid "Build from scratch" msgstr "Κατασκευή από το μηδέν" msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" "Αυτή η επιλογή ξαναδημιουργεί πλήρως τα ευρετήρια σε όλα τα αποθετήρια " diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po @@ -2331,7 +2331,7 @@ msgid "Build from scratch" msgstr "Construire ex nihilo" msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" "Cette option ré-indexe complètement tous les dépôts pour pouvoir faire " diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po @@ -1759,7 +1759,7 @@ msgid "Build from scratch" msgstr "一度削除してから再度インデックスを作成" msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea " diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po @@ -2283,7 +2283,7 @@ msgid "Build from scratch" msgstr "Пересобрать" msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" "Эта опция полностью переиндексирует все репозитории для корректной работы " diff --git a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po @@ -1377,7 +1377,7 @@ msgid "Build from scratch" msgstr "Побудувати з нуля" msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" "Цей варіант повністю переіндексує репозиторії для правильного " diff --git a/kallithea/templates/admin/settings/settings_search.html b/kallithea/templates/admin/settings/settings_search.html --- a/kallithea/templates/admin/settings/settings_search.html +++ b/kallithea/templates/admin/settings/settings_search.html @@ -9,7 +9,7 @@ ${h.form(url('admin_settings_search'), m ${_('Build from scratch')} - ${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')} + ${_('This option completely reindexes all of the repositories for proper fulltext search capabilities.')} diff --git a/kallithea/templates/changelog/changelog_table.html b/kallithea/templates/changelog/changelog_table.html --- a/kallithea/templates/changelog/changelog_table.html +++ b/kallithea/templates/changelog/changelog_table.html @@ -55,7 +55,7 @@
${h.age(cs.date,True)}
- <% message_lines = cs.message.splitlines() %> + <% message_lines = cs.message.strip().splitlines() or [_("(No commit message)")] %> %if len(message_lines) > 1: diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -167,7 +167,7 @@ ${self.repo_context_bar('showpullrequest %endfor -
${h.urlify_text(cs.message.splitlines()[0], c.repo_name)}
+
${h.urlify_text(cs.message.strip().split('\n')[0] or _("(No commit message)"), c.repo_name)}
%endif