Skip to content

Commit 550833c

Browse files
wxiaoguangwxiaoguang
authored
Merge branch 'main' into list-pr-by-base-branch
2 parents 579213f + 8db8a3b commit 550833c

File tree

12 files changed

+39
-30
lines changed

12 files changed

+39
-30
lines changed

‎options/locale/locale_ga-IE.ini‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,8 @@ issues.filter_milestones=Cloch Mhíle Scagaire
14641464
issues.filter_projects=Tionscadal Scagaire
14651465
issues.filter_labels=Lipéad Scagaire
14661466
issues.filter_reviewers=Athbhreithneoir Scagaire
1467+
issues.filter_no_results=Gan torthaí
1468+
issues.filter_no_results_placeholder=Bain triail as do scagairí cuardaigh a choigeartú.
14671469
issues.new=Eagrán Nua
14681470
issues.new.title_empty=Ní féidir leis an teideal a bheith folamh
14691471
issues.new.labels=Lipéid
@@ -1701,7 +1703,9 @@ issues.time_estimate_invalid=Tá formáid meastachán ama neamhbhailí
17011703
issues.start_tracking_history=thosaigh ag obair %s
17021704
issues.tracker_auto_close=Stopfar ama go huathoibríoch nuair a dhúnfar an tsaincheist seo
17031705
issues.tracking_already_started=`Tá tús curtha agat cheana féin ag rianú ama ar <a href="%s">eagrán eile</a>!`
1706+
issues.stop_tracking=Stad uaineadóir
17041707
issues.stop_tracking_history=d'oibrigh do <b>%[1]s</b> %[2]s
1708+
issues.cancel_tracking=Caith amach
17051709
issues.cancel_tracking_history=`rianú ama curtha ar ceal %s`
17061710
issues.del_time=Scrios an log ama seo
17071711
issues.add_time_history=cuireadh am caite <b>%[1]s</b> %[2]s leis

‎options/locale/locale_pt-PT.ini‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,8 @@ issues.filter_milestones=Filtrar etapa
14641464
issues.filter_projects=Filtrar planeamento
14651465
issues.filter_labels=Filtrar rótulo
14661466
issues.filter_reviewers=Filtrar revisor
1467+
issues.filter_no_results=Sem resultados
1468+
issues.filter_no_results_placeholder=Tente ajustar os seus filtros de pesquisa.
14671469
issues.new=Questão nova
14681470
issues.new.title_empty=O título não pode estar vazio
14691471
issues.new.labels=Rótulos

‎templates/admin/user/view_details.tmpl‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,25 @@
99
{{if .User.IsAdmin}}
1010
<span class="ui basic label">{{ctx.Locale.Tr "admin.users.admin"}}</span>
1111
{{end}}
12+
{{if .User.IsTypeBot}}
13+
<span class="ui basic label">{{ctx.Locale.Tr "admin.users.bot"}}</span>
14+
{{end}}
1215
</div>
1316
<div class="flex-item-body">
1417
<b>{{ctx.Locale.Tr "admin.users.auth_source"}}:</b>
15-
{{if eq .LoginSource.ID 0}}
16-
{{ctx.Locale.Tr "admin.users.local"}}
17-
{{else}}
18-
{{.LoginSource.Name}}
19-
{{end}}
18+
{{Iif (eq .LoginSource.ID 0) (ctx.Locale.Tr "admin.users.local") .LoginSource.Name}}
2019
</div>
2120
<div class="flex-item-body">
2221
<b>{{ctx.Locale.Tr "admin.users.activated"}}:</b>
23-
{{if .User.IsActive}}
24-
{{svg "octicon-check"}}
25-
{{else}}
26-
{{svg "octicon-x"}}
27-
{{end}}
22+
{{svg (Iif .User.IsActive "octicon-check" "octicon-x")}}
23+
</div>
24+
<div class="flex-item-body">
25+
<b>{{ctx.Locale.Tr "admin.users.prohibit_login"}}:</b>
26+
{{svg (Iif .User.ProhibitLogin "octicon-check" "octicon-x")}}
2827
</div>
2928
<div class="flex-item-body">
3029
<b>{{ctx.Locale.Tr "admin.users.restricted"}}:</b>
31-
{{if .User.IsRestricted}}
32-
{{svg "octicon-check"}}
33-
{{else}}
34-
{{svg "octicon-x"}}
35-
{{end}}
30+
{{svg (Iif .User.IsRestricted "octicon-check" "octicon-x")}}
3631
</div>
3732
<div class="flex-item-body">
3833
<b>{{ctx.Locale.Tr "settings.visibility"}}:</b>
@@ -42,11 +37,7 @@
4237
</div>
4338
<div class="flex-item-body">
4439
<b>{{ctx.Locale.Tr "admin.users.2fa"}}:</b>
45-
{{if .TwoFactorEnabled}}
46-
<span class="text green">{{svg "octicon-check"}}</span>
47-
{{else}}
48-
{{svg "octicon-x"}}
49-
{{end}}
40+
{{svg (Iif .TwoFactorEnabled "octicon-check" "octicon-x")}}
5041
</div>
5142
{{if .User.Language}}
5243
<div class="flex-item-body">

‎templates/admin/user/view_emails.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="flex-item">
44
<div class="flex-item-main">
55
<div class="flex-text-block">
6-
{{.Email}}
6+
<a href="mailto:{{.Email}}">{{.Email}}</a>
77
{{if .IsPrimary}}
88
<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
99
{{end}}

‎templates/repo/issue/openclose.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{{ctx.Locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}}
1818
</a>
1919
<a class="{{if eq .State "closed"}}active {{end}}item flex-text-inline" href="{{if eq .State "closed"}}{{$allStatesLink}}{{else}}{{$closedLink}}{{end}}">
20-
{{svg "octicon-check"}}
20+
{{svg "octicon-issue-closed"}}
2121
{{ctx.Locale.PrettyNumber .ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}}
2222
</a>
2323
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/assignee?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
77
>
88
<input class="combo-value" name="assignee_ids" type="hidden" value="{{$data.SelectedAssigneeIDs}}">
9-
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
9+
<div class="ui dropdown text-flex-grow {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
1010
<a class="text muted">
1111
<strong>{{ctx.Locale.Tr "repo.issues.new.assignees"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
1212
</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/labels?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
55
>
66
<input class="combo-value" name="label_ids" type="hidden" value="{{$data.SelectedLabelIDs}}">
7-
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
7+
<div class="ui dropdown text-flex-grow {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
88
<a class="text muted">
99
<strong>{{ctx.Locale.Tr "repo.issues.new.labels"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
1010
</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/milestone?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
77
>
88
<input class="combo-value" name="milestone_id" type="hidden" value="{{$data.SelectedMilestoneID}}">
9-
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
9+
<div class="ui dropdown text-flex-grow {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
1010
<a class="text muted">
1111
<strong>{{ctx.Locale.Tr "repo.issues.new.milestone"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
1212
</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/projects?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
77
>
88
<input class="combo-value" name="project_id" type="hidden" value="{{$data.SelectedProjectID}}">
9-
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
9+
<div class="ui dropdown text-flex-grow {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
1010
<a class="text muted">
1111
<strong>{{ctx.Locale.Tr "repo.issues.new.projects"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
1212
</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/request_review?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
77
>
88
<input type="hidden" class="combo-value" name="reviewer_ids">{{/* match CreateIssueForm */}}
9-
<div class="ui dropdown {{if or (not $hasCandidates) (not $data.CanChooseReviewer)}}disabled{{end}}">
9+
<div class="ui dropdown text-flex-grow {{if or (not $hasCandidates) (not $data.CanChooseReviewer)}}disabled{{end}}">
1010
<a class="text muted">
1111
<strong>{{ctx.Locale.Tr "repo.issues.review.reviewers"}}</strong> {{if $data.CanChooseReviewer}}{{svg "octicon-gear"}}{{end}}
1212
</a>

0 commit comments

Comments
 (0)