Mercurial > kallithea
changeset 8795:aa3e860a1fe0
Merge stable
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 21 Dec 2020 01:19:49 +0100 |
| parents | 7c541dc095c8 (current diff) af8ed8e6714e (diff) |
| children | bcd18ce5de66 |
| files | kallithea/controllers/api/api.py kallithea/i18n/de/LC_MESSAGES/kallithea.po kallithea/i18n/el/LC_MESSAGES/kallithea.po kallithea/i18n/fr/LC_MESSAGES/kallithea.po kallithea/i18n/ja/LC_MESSAGES/kallithea.po kallithea/i18n/ru/LC_MESSAGES/kallithea.po kallithea/i18n/uk/LC_MESSAGES/kallithea.po kallithea/templates/changelog/changelog_table.html kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 10 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/api/api.py Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/controllers/api/api.py Mon Dec 21 01:19:49 2020 +0100 @@ -1266,7 +1266,7 @@ 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 @@ 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(
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Dec 21 01:19:49 2020 +0100 @@ -2044,7 +2044,7 @@ 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 "
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Mon Dec 21 01:19:49 2020 +0100 @@ -2201,7 +2201,7 @@ 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 "" "Αυτή η επιλογή ξαναδημιουργεί πλήρως τα ευρετήρια σε όλα τα αποθετήρια "
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Dec 21 01:19:49 2020 +0100 @@ -2331,7 +2331,7 @@ 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 "
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Dec 21 01:19:49 2020 +0100 @@ -1759,7 +1759,7 @@ 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 "
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Dec 21 01:19:49 2020 +0100 @@ -2283,7 +2283,7 @@ 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 "" "Эта опция полностью переиндексирует все репозитории для корректной работы "
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Dec 21 01:19:49 2020 +0100 @@ -1377,7 +1377,7 @@ 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 "" "Цей варіант повністю переіндексує репозиторії для правильного "
--- a/kallithea/templates/admin/settings/settings_search.html Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/templates/admin/settings/settings_search.html Mon Dec 21 01:19:49 2020 +0100 @@ -9,7 +9,7 @@ ${_('Build from scratch')} </label> </div> - <span class="help-block">${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')}</span> + <span class="help-block">${_('This option completely reindexes all of the repositories for proper fulltext search capabilities.')}</span> </div> </div>
--- a/kallithea/templates/changelog/changelog_table.html Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/templates/changelog/changelog_table.html Mon Dec 21 01:19:49 2020 +0100 @@ -55,7 +55,7 @@ <td class="date"> <div data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div> </td> - <% message_lines = cs.message.splitlines() %> + <% message_lines = cs.message.strip().splitlines() or [_("(No commit message)")] %> %if len(message_lines) > 1: <td class="expand_commit" title="${_('Expand commit message')}"> <i class="icon-align-left"></i>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Fri Nov 13 00:38:39 2020 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Mon Dec 21 01:19:49 2020 +0100 @@ -167,7 +167,7 @@ </span> %endfor </div> - <div class="message">${h.urlify_text(cs.message.splitlines()[0], c.repo_name)}</div> + <div class="message">${h.urlify_text(cs.message.strip().split('\n')[0] or _("(No commit message)"), c.repo_name)}</div> </td> %endif </tr>