Skip to content

Commit ec50f81

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated translations via Crowdin Upgrade `tqdm` dependency (go-gitea#30996) Fix JS error when editing a merged PR's title (go-gitea#30990) template: `label` fix correct input id (go-gitea#30987)
2 parents 4d0309f + 68d5c18 commit ec50f81

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

options/locale/locale_zh-CN.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3320,6 +3320,7 @@ self_check.database_collation_case_insensitive=数据库正在使用一个校验
33203320
self_check.database_inconsistent_collation_columns=数据库正在使用%s的排序规则,但是这些列使用了不匹配的排序规则。这可能会造成一些意外问题。
33213321
self_check.database_fix_mysql=对于MySQL/MariaDB用户,您可以使用“gitea doctor convert”命令来解决校验问题。 或者您也可以通过 "ALTER ... COLLATE ..." 这样的SQL 来手动解决这个问题。
33223322
self_check.database_fix_mssql=对于MSSQL用户,您现在只能通过"ALTER ... COLLATE ..."SQLs手动解决这个问题。
3323+
self_check.location_origin_mismatch=当前 URL (%[1]s) 与 Gitea 的 URL (%[2]s) 不匹配 。 如果您正在使用反向代理,请确保设置正确的“主机”和“X-转发-原始”标题。
33233324

33243325
[action]
33253326
create_repo=创建了仓库 <a href="%s">%s</a>
@@ -3347,6 +3348,7 @@ mirror_sync_create=从镜像同步了引用 <a href="%[2]s">%[3]s</a> 至仓库
33473348
mirror_sync_delete=从镜像同步并从 <a href="%[1]s">%[3]s</a> 删除了引用 <code>%[2]s</code>
33483349
approve_pull_request=`批准了 <a href="%[1]s">%[3]s#%[2]s</a>`
33493350
reject_pull_request=`建议变更 <a href="%[1]s">%[3]s#%[2]s</a>`
3351+
publish_release=`在 <a href="%[1]s">%[3]s</a> 发布了 <a href="%[2]s"> %[4]s </a>`
33503352
review_dismissed=`取消了 <b>%[4]s</b> 对 <a href="%[1]s">%[3]s#%[2]s</a> 的变更请求`
33513353
review_dismissed_reason=原因:
33523354
create_branch=于 <a href="%[1]s">%[4]s</a> 创建了分支 <a href="%[2]s">%[3]s</a>

poetry.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/repo/issue/view_title.tmpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
</div>
2727
<div class="issue-title-buttons">
2828
<button class="ui small basic cancel button">{{ctx.Locale.Tr "repo.issues.cancel"}}</button>
29-
<button class="ui small primary button"
30-
data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title"
31-
{{if .Issue.IsPull}}data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch"{{end}}>
29+
<button class="ui small primary button" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title">
3230
{{ctx.Locale.Tr "repo.issues.save"}}
3331
</button>
3432
</div>
@@ -77,7 +75,7 @@
7775
{{ctx.Locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref}}
7876
</span>
7977
{{end}}
80-
<span id="pull-desc-editor" class="tw-hidden flex-text-block">
78+
<span id="pull-desc-editor" class="tw-hidden flex-text-block" data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch">
8179
<div class="ui floating filter dropdown">
8280
<div class="ui basic small button tw-mr-0">
8381
<span class="text">{{ctx.Locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span>

templates/repo/settings/deploy_keys.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div class="field">
2929
<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
3030
<input id="ssh-key-is-writable" name="is_writable" type="checkbox" value="1">
31-
<label for="is_writable">
31+
<label for="ssh-key-is-writable">
3232
{{ctx.Locale.Tr "repo.settings.is_writable"}}
3333
</label>
3434
<small class="tw-pl-[26px]">{{ctx.Locale.Tr "repo.settings.is_writable_info"}}</small>

web_src/js/features/repo-issue.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,12 @@ export function initRepoIssueTitleEdit() {
626626
showElem(issueTitleDisplay);
627627
showElem('#pull-desc-display');
628628
});
629+
630+
const pullDescEditor = document.querySelector('#pull-desc-editor'); // it may not exist for a merged PR
631+
const prTargetUpdateUrl = pullDescEditor?.getAttribute('data-target-update-url');
632+
629633
const editSaveButton = issueTitleEditor.querySelector('.ui.primary.button');
630634
editSaveButton.addEventListener('click', async () => {
631-
const prTargetUpdateUrl = editSaveButton.getAttribute('data-target-update-url');
632635
const newTitle = issueTitleInput.value.trim();
633636
try {
634637
if (newTitle && newTitle !== oldTitle) {

0 commit comments

Comments
 (0)