Skip to content

Commit 0373414

Browse files
65436543
authored
Merge branch 'main' into fix-14025-edit-pr-permissions
2 parents 5a7ca62 + 131b59e commit 0373414

File tree

13 files changed

+146
-131
lines changed

13 files changed

+146
-131
lines changed

‎options/locale/locale_ja-JP.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,8 @@ issues.review.resolved_by=がこの会話を解決済みにしました
12851285
issues.assignee.error=予期しないエラーにより、一部の担当者を追加できませんでした。
12861286
issues.reference_issue.body=内容
12871287

1288+
compare.compare_base=基準
1289+
compare.compare_head=比較
12881290

12891291
pulls.desc=プルリクエストとコードレビューの有効化。
12901292
pulls.new=新しいプルリクエスト
@@ -1887,6 +1889,7 @@ diff.file_image_width=幅
18871889
diff.file_image_height=高さ
18881890
diff.file_byte_size=サイズ
18891891
diff.file_suppressed=ファイル差分が大きすぎるため省略します
1892+
diff.file_suppressed_line_too_long=長すぎる行があるためファイル差分は表示されません
18901893
diff.too_many_files=変更されたファイルが多すぎるため、一部のファイルは表示されません
18911894
diff.comment.placeholder=コメントを残す
18921895
diff.comment.markdown_info=Markdownによる書式設定をサポートしています。
@@ -2309,6 +2312,7 @@ auths.allowed_domains_helper=すべてのドメインを許可する場合は空
23092312
auths.enable_tls=TLS暗号化を有効にする
23102313
auths.skip_tls_verify=TLS検証を省略
23112314
auths.pam_service_name=PAMサービス名
2315+
auths.pam_email_domain=PAM メールドメイン名 (オプション)
23122316
auths.oauth2_provider=OAuth2プロバイダー
23132317
auths.oauth2_icon_url=アイコンのURL
23142318
auths.oauth2_clientID=クライアントID (キー)
@@ -2408,6 +2412,7 @@ config.db_path=パス
24082412
config.service_config=サービス設定
24092413
config.register_email_confirm=登録にはメールによる確認が必要
24102414
config.disable_register=セルフ登録無効
2415+
config.allow_only_internal_registration=Gitea上での登録のみを許可
24112416
config.allow_only_external_registration=外部サービスを使用した登録のみを許可
24122417
config.enable_openid_signup=OpenIDを使ったセルフ登録有効
24132418
config.enable_openid_signin=OpenIDを使ったサインイン有効

‎options/locale/locale_pt-PT.ini

Lines changed: 40 additions & 40 deletions
Large diffs are not rendered by default.

‎options/locale/locale_zh-CN.ini

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,8 @@ issues.review.resolved_by=标记问题为已解决
12851285
issues.assignee.error=因为未知原因，并非所有的指派都成功。
12861286
issues.reference_issue.body=内容
12871287
1288+
compare.compare_base=基准分支
1289+
compare.compare_head=比较
12881290
12891291
pulls.desc=启用合并请求和代码评审。
12901292
pulls.new=创建合并请求
@@ -1526,7 +1528,7 @@ search.fuzzy=模糊
15261528
search.match=匹配
15271529
search.results=在 <a href="%s"> %s </a> 中搜索 "%s" 的结果
15281530
1529-
settings=仓库设置
1531+
settings=设置
15301532
settings.desc=设置是你可以管理仓库设置的地方
15311533
settings.options=仓库
15321534
settings.collaboration=协作者
@@ -1535,7 +1537,7 @@ settings.collaboration.write=可写权限
15351537
settings.collaboration.read=可读权限
15361538
settings.collaboration.owner=所有者
15371539
settings.collaboration.undefined=未定义
1538-
settings.hooks=管理 Web 钩子
1540+
settings.hooks=Web 钩子
15391541
settings.githooks=管理 Git 钩子
15401542
settings.basic_settings=基本设置
15411543
settings.mirror_settings=镜像设置
@@ -1745,7 +1747,7 @@ settings.add_telegram_hook_desc=将 <a href="%s">Telegram</a> 集成到您的仓
17451747
settings.add_matrix_hook_desc=将 <a href="%s">Matrix</a> 集成到您的仓库中。
17461748
settings.add_msteams_hook_desc=将 <a href="%s">Microsoft Teams</a> 集成到您的仓库中。
17471749
settings.add_feishu_hook_desc=将 <a href="%s">Feishu</a> 集成到您的仓库中。
1748-
settings.deploy_keys=管理部署密钥
1750+
settings.deploy_keys=部署密钥
17491751
settings.add_deploy_key=添加部署密钥
17501752
settings.deploy_key_desc=部署密钥具有对仓库的只读拉取权限。
17511753
settings.is_writable=启用写权限
@@ -1759,7 +1761,7 @@ settings.add_key_success=部署密钥 '%s' 添加成功。
17591761
settings.deploy_key_deletion=删除部署密钥
17601762
settings.deploy_key_deletion_desc=删除部署密钥将吊销对此存储库的访问权限。继续？
17611763
settings.deploy_key_deletion_success=部署密钥已删除。
1762-
settings.branches=分支列表
1764+
settings.branches=分支
17631765
settings.protected_branch=分支保护
17641766
settings.protected_branch_can_push=允许推吗？
17651767
settings.protected_branch_can_push_yes=你可以推
@@ -1887,6 +1889,7 @@ diff.file_image_width=宽度
18871889
diff.file_image_height=高度
18881890
diff.file_byte_size=大小
18891891
diff.file_suppressed=文件差异内容过多而无法显示
1892+
diff.file_suppressed_line_too_long=文件差异因一行或多行过长而隐藏
18901893
diff.too_many_files=部分文件因为文件数量过多而无法显示
18911894
diff.comment.placeholder=留下评论
18921895
diff.comment.markdown_info=支持使用Markdown格式。
@@ -2309,6 +2312,7 @@ auths.allowed_domains_helper=置空将允许所有域名，每个域名用逗号
23092312
auths.enable_tls=启用 TLS 加密
23102313
auths.skip_tls_verify=忽略 TLS 验证
23112314
auths.pam_service_name=PAM 服务名称
2315+
auths.pam_email_domain=PAM 电子邮件域(可选)
23122316
auths.oauth2_provider=OAuth2 提供程序
23132317
auths.oauth2_icon_url=图标 URL
23142318
auths.oauth2_clientID=客户端 ID （键）
@@ -2408,6 +2412,7 @@ config.db_path=数据库路径
24082412
config.service_config=服务配置
24092413
config.register_email_confirm=需要电子邮件确认注册
24102414
config.disable_register=禁止用户注册
2415+
config.allow_only_internal_registration=只允许通过 Gitea 进行注册
24112416
config.allow_only_external_registration=仅允许通过外部服务注册
24122417
config.enable_openid_signup=启用 OpenID 自注册
24132418
config.enable_openid_signin=启用 OpenID 登录

‎templates/explore/code.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<a href="{{EscapePound $repo.HTMLURL}}/src/commit/{{$result.CommitID}}/{{EscapePound $result.Filename}}#L{{.}}"><span>{{.}}</span></a>
5151
{{end}}
5252
</td>
53-
<td class="lines-code"><pre><code class="chroma"><ol class="linenums">{{.FormattedLines | Safe}}</ol></code></pre></td>
53+
<td class="lines-code chroma"><code class="code-inner">{{.FormattedLines | Safe}}</code></td>
5454
</tr>
5555
</tbody>
5656
</table>

‎templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<input id="reviewer_id" name="reviewer_id" type="hidden" value="{{.reviewer_id}}">
88
<div class="ui {{if or (not .Reviewers) (not .CanChooseReviewer) .Repository.IsArchived}}disabled{{end}} floating jump select-reviewers-modify dropdown">
9-
<span class="text">
9+
<a class="text df ac muted">
1010
<strong>{{.i18n.Tr "repo.issues.review.reviewers"}}</strong>
1111
{{if and .CanChooseReviewer (not .Repository.IsArchived)}}
12-
{{svg "octicon-gear"}}
12+
{{svg "octicon-gear" 16 "ml-2"}}
1313
{{end}}
14-
</span>
14+
</a>
1515
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
1616
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_reviewer_title"}}</div>
1717
{{if .Reviewers}}
@@ -95,12 +95,12 @@
9595
{{end}}
9696

9797
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-label dropdown">
98-
<span class="text">
98+
<a class="text df ac muted">
9999
<strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong>
100100
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
101-
{{svg "octicon-gear"}}
101+
{{svg "octicon-gear" 16 "ml-2"}}
102102
{{end}}
103-
</span>
103+
</a>
104104
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels">
105105
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_labels_title"}}</div>
106106
{{if or .Labels .OrgLabels}}
@@ -130,12 +130,12 @@
130130
<div class="ui divider"></div>
131131

132132
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-milestone dropdown">
133-
<span class="text">
133+
<a class="text df ac muted">
134134
<strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong>
135135
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
136-
{{svg "octicon-gear"}}
136+
{{svg "octicon-gear" 16 "ml-2"}}
137137
{{end}}
138-
</span>
138+
</a>
139139
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone">
140140
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_milestone_title"}}</div>
141141
{{if or .OpenMilestones .ClosedMilestones}}
@@ -193,12 +193,12 @@
193193
<div class="ui divider"></div>
194194

195195
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown">
196-
<span class="text">
196+
<a class="text df ac muted">
197197
<strong>{{.i18n.Tr "repo.issues.new.projects"}}</strong>
198198
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
199-
{{svg "octicon-gear"}}
199+
{{svg "octicon-gear" 16 "ml-2"}}
200200
{{end}}
201-
</span>
201+
</a>
202202
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects">
203203
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_projects"}}</div>
204204
{{if .OpenProjects}}
@@ -244,12 +244,12 @@
244244

245245
<input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}">
246246
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-assignees-modify dropdown">
247-
<span class="text">
247+
<a class="text df ac muted">
248248
<strong>{{.i18n.Tr "repo.issues.new.assignees"}}</strong>
249249
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
250-
{{svg "octicon-gear"}}
250+
{{svg "octicon-gear" 16 "ml-2"}}
251251
{{end}}
252-
</span>
252+
</a>
253253
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee">
254254
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_assignees_title"}}</div>
255255
<div class="ui icon search input">
@@ -312,12 +312,12 @@
312312
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/watch">
313313
<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}" />
314314
{{$.CsrfTokenHtml}}
315-
<button class="fluid ui button">
315+
<button class="fluid ui button df jc">
316316
{{if $.IssueWatch.IsWatching}}
317-
{{svg "octicon-mute"}}
317+
{{svg "octicon-mute" 16 "mr-3"}}
318318
{{.i18n.Tr "repo.issues.unsubscribe"}}
319319
{{else}}
320-
{{svg "octicon-unmute"}}
320+
{{svg "octicon-unmute" 16 "mr-3"}}
321321
{{.i18n.Tr "repo.issues.subscribe"}}
322322
{{end}}
323323
</button>
@@ -338,34 +338,30 @@
338338
{{$.CsrfTokenHtml}}
339339
</form>
340340
{{if $.IsStopwatchRunning}}
341-
<div class="ui buttons fluid">
342-
<button class="ui button issue-stop-time">{{.i18n.Tr "repo.issues.stop_tracking"}}</button>
343-
<button class="ui negative button issue-cancel-time">{{.i18n.Tr "repo.issues.cancel_tracking"}}</button>
344-
</div>
341+
<button class="ui fluid button issue-stop-time">{{.i18n.Tr "repo.issues.stop_tracking"}}</button>
342+
<button class="ui fluid negative button issue-cancel-time mt-3">{{.i18n.Tr "repo.issues.cancel_tracking"}}</button>
345343
{{else}}
346344
{{if .HasUserStopwatch}}
347345
<div class="ui warning message">
348346
{{.i18n.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL | Safe}}
349347
</div>
350348
{{end}}
351-
<div class="ui buttons two fluid">
352-
<button class="ui button poping up issue-start-time" data-content='{{.i18n.Tr "repo.issues.start_tracking"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.start_tracking_short"}}</button>
353-
<div class="ui mini modal issue-start-time-modal">
354-
<div class="header">{{.i18n.Tr "repo.issues.add_time"}}</div>
355-
<div class="content">
356-
<form method="POST" id="add_time_manual_form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/add" class="ui action input fluid">
357-
{{$.CsrfTokenHtml}}
358-
<input placeholder='{{.i18n.Tr "repo.issues.add_time_hours"}}' type="number" name="hours">
359-
<input placeholder='{{.i18n.Tr "repo.issues.add_time_minutes"}}' type="number" name="minutes" class="ui compact">
360-
</form>
361-
</div>
362-
<div class="actions">
363-
<div class="ui green approve button">{{.i18n.Tr "repo.issues.add_time_short"}}</div>
364-
<div class="ui red cancel button">{{.i18n.Tr "repo.issues.add_time_cancel"}}</div>
365-
</div>
349+
<button class="ui fluid button poping up issue-start-time" data-content='{{.i18n.Tr "repo.issues.start_tracking"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.start_tracking_short"}}</button>
350+
<div class="ui mini modal issue-start-time-modal">
351+
<div class="header">{{.i18n.Tr "repo.issues.add_time"}}</div>
352+
<div class="content">
353+
<form method="POST" id="add_time_manual_form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/add" class="ui action input fluid">
354+
{{$.CsrfTokenHtml}}
355+
<input placeholder='{{.i18n.Tr "repo.issues.add_time_hours"}}' type="number" name="hours">
356+
<input placeholder='{{.i18n.Tr "repo.issues.add_time_minutes"}}' type="number" name="minutes" class="ui compact">
357+
</form>
358+
</div>
359+
<div class="actions">
360+
<div class="ui green approve button">{{.i18n.Tr "repo.issues.add_time_short"}}</div>
361+
<div class="ui red cancel button">{{.i18n.Tr "repo.issues.add_time_cancel"}}</div>
366362
</div>
367-
<button class="ui button green poping up issue-add-time" data-content='{{.i18n.Tr "repo.issues.add_time"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.add_time_short"}}</button>
368363
</div>
364+
<button class="ui fluid button green poping up issue-add-time mt-3" data-content='{{.i18n.Tr "repo.issues.add_time"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.add_time_short"}}</button>
369365
{{end}}
370366
</div>
371367
</div>
@@ -397,21 +393,23 @@
397393
<span class="text"><strong>{{.i18n.Tr "repo.issues.due_date"}}</strong></span>
398394
<div class="ui form" id="deadline-loader">
399395
<div class="ui negative message" id="deadline-err-invalid-date" style="display: none;">
400-
<i class="close icon"></i>
396+
{{svg "octicon-x" 16 "close icon"}}
401397
{{.i18n.Tr "repo.issues.due_date_invalid"}}
402398
</div>
403399
{{if ne .Issue.DeadlineUnix 0}}
404400
<p>
405-
{{svg "octicon-calendar"}}
406-
{{.Issue.DeadlineUnix.FormatDate}}
407-
{{if .Issue.IsOverdue}}
408-
<span style="color: red;">{{.i18n.Tr "repo.issues.due_date_overdue"}}</span>
409-
{{end}}
410-
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
411-
<br/>
412-
<a class="issue-due-edit"><i class="edit icon"></i>{{$.i18n.Tr "repo.issues.due_date_form_edit"}}</a> -
413-
<a class="issue-due-remove"><i class="remove icon"></i>{{$.i18n.Tr "repo.issues.due_date_form_remove"}}</a>
414-
{{end}}
401+
<div class="df sb ac">
402+
<div class="due-date poping up {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-content="{{.i18n.Tr "repo.issues.due_date_overdue"}}"{{end}}>
403+
{{svg "octicon-calendar" 16 "mr-3"}}
404+
{{.Issue.DeadlineUnix.FormatDate}}
405+
</div>
406+
<div>
407+
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
408+
<a class="issue-due-edit poping up muted" data-content="{{$.i18n.Tr "repo.issues.due_date_form_edit"}}">{{svg "octicon-pencil" 16 "mr-2"}}</a>
409+
<a class="issue-due-remove poping up muted" data-content="{{$.i18n.Tr "repo.issues.due_date_form_remove"}}">{{svg "octicon-trash"}}</a>
410+
{{end}}
411+
</div>
412+
</div>
415413
</p>
416414
{{else}}
417415
<p><i>{{.i18n.Tr "repo.issues.due_date_not_set"}}</i></p>
@@ -424,9 +422,9 @@
424422
<input required placeholder="{{.i18n.Tr "repo.issues.due_date_form"}}" {{if gt .Issue.DeadlineUnix 0}}value="{{.Issue.DeadlineUnix.Format "2006-01-02"}}"{{end}} type="date" name="deadlineDate" id="deadlineDate">
425423
<button class="ui green icon button">
426424
{{if ne .Issue.DeadlineUnix 0}}
427-
<i class="edit icon"></i>
425+
{{svg "octicon-pencil"}}
428426
{{else}}
429-
<i class="plus icon"></i>
427+
{{svg "octicon-plus"}}
430428
{{end}}
431429
</button>
432430
</form>
@@ -467,7 +465,7 @@
467465
</div>
468466
<div class="item-right df ac">
469467
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
470-
<a class="delete-dependency-button poping up ci" data-id="{{.Issue.ID}}" data-type="blocking" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
468+
<a class="delete-dependency-button poping up ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
471469
{{svg "octicon-trash" 16}}
472470
</a>
473471
{{end}}
@@ -494,7 +492,7 @@
494492
</div>
495493
<div class="item-right df ac">
496494
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
497-
<a class="delete-dependency-button poping up ci" data-id="{{.Issue.ID}}" data-type="blockedBy" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
495+
<a class="delete-dependency-button poping up ci muted" data-id="{{.Issue.ID}}" data-type="blockedBy" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
498496
{{svg "octicon-trash" 16}}
499497
</a>
500498
{{end}}
@@ -516,7 +514,7 @@
516514
<div class="default text">{{.i18n.Tr "repo.issues.dependency.add"}}</div>
517515
</div>
518516
<button class="ui green icon button">
519-
<i class="plus icon"></i>
517+
{{svg "octicon-plus"}}
520518
</button>
521519
</div>
522520
</form>
@@ -550,12 +548,12 @@
550548
{{end}}</p>
551549
</div>
552550
<div class="actions">
553-
<div class="ui basic red cancel inverted button">
554-
<i class="remove icon"></i>
551+
<div class="ui red cancel inverted button">
552+
{{svg "octicon-x"}}
555553
{{.i18n.Tr "repo.issues.dependency.cancel"}}
556554
</div>
557-
<div class="ui basic green ok inverted button">
558-
<i class="checkmark icon"></i>
555+
<div class="ui green ok inverted button">
556+
{{svg "octicon-check"}}
559557
{{.i18n.Tr "repo.issues.dependency.remove"}}
560558
</div>
561559
</div>

‎templates/repo/projects/view.tmpl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<div class="column">
77
{{template "repo/issue/navbar" .}}
88
</div>
9-
<div class="column center aligned">
10-
{{template "repo/issue/search" .}}
11-
</div>
129
<div class="column right aligned">
1310
{{if and .CanWriteProjects (not .Repository.IsArchived) .PageIsProjects}}
1411
<a class="ui green button show-modal item" data-modal="#new-board-item">{{.i18n.Tr "new_project_board"}}</a>

‎templates/repo/search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<a href="{{EscapePound $.SourcePath}}/src/commit/{{$result.CommitID}}/{{EscapePound $result.Filename}}#L{{.}}"><span>{{.}}</span></a>
4949
{{end}}
5050
</td>
51-
<td class="lines-code"><pre><code class="chroma"><ol class="linenums">{{.FormattedLines | Safe}}</ol></code></pre></td>
51+
<td class="lines-code chroma"><code class="code-inner">{{.FormattedLines | Safe}}</code></td>
5252
</tr>
5353
</tbody>
5454
</table>

0 commit comments

Comments
 (0)