Skip to content

Commit daaf0ad

Browse files
GiteaBotdenyskon
GiteaBot
and
denyskon
authored
cleanup locale function usage (go-gitea#27227) (go-gitea#27240)
Backport go-gitea#27227 by @denyskon Throughout the Gitea codebase, you can meet some weird constructions to make `locale.Tr` work in subtemplates. Since we now have `ctx.Locale.Tr` which solves that problem, clean up various templates which pass `locale` through `dict` or use some weird constructions like `$.root.locale` Going on, it would be great to replace every case of `$.locale.Tr` and `.locale.Tr` with `ctx.Locale.Tr`, but that needs to be done with patience. Co-authored-by: Denys Konovalov <[email protected]>
1 parent 9fc24a8 commit daaf0ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+121
-133
lines changed

‎templates/admin/base/search.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="ui secondary filter menu gt-ac gt-mx-0">
22
<form class="ui form ignore-dirty gt-f1">
33
<div class="ui fluid action input">
4-
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
4+
{{template "shared/searchinput" dict "Value" .Keyword "AutoFocus" true}}
55
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
66
</div>
77
</form>

‎templates/admin/emails/list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="ui secondary filter menu gt-ac gt-mx-0">
88
<form class="ui form ignore-dirty gt-f1">
99
<div class="ui fluid action input">
10-
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
10+
{{template "shared/searchinput" dict "Value" .Keyword "AutoFocus" true}}
1111
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
1212
</div>
1313
</form>

‎templates/admin/packages/list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="ui attached segment">
1515
<form class="ui form ignore-dirty">
1616
<div class="ui fluid action input">
17-
{{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}}
17+
{{template "shared/searchinput" dict "Value" .Query "AutoFocus" true}}
1818
<select class="ui dropdown" name="type">
1919
<option value="">{{.locale.Tr "packages.filter.type"}}</option>
2020
<option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>

‎templates/admin/repo/search.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="ui secondary filter menu gt-ac gt-mx-0">
22
<form class="ui form ignore-dirty gt-f1">
33
<div class="ui fluid action input">
4-
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
4+
{{template "shared/searchinput" dict "Value" .Keyword "AutoFocus" true}}
55
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
66
</div>
77
</form>

‎templates/admin/repo/unadopted.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<input type="hidden" name="action" value="adopt">
3838
<input type="hidden" name="q" value="{{$.Keyword}}">
3939
<input type="hidden" name="page" value="{{$.CurrentPage}}">
40-
{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
40+
{{template "base/modal_actions_confirm"}}
4141
</form>
4242
</div>
4343
<button class="ui button red show-modal gt-p-3" data-modal="#delete-unadopted-modal-{{$dirI}}">{{svg "octicon-x"}} {{$.locale.Tr "repo.delete_preexisting_label"}}</button>
@@ -54,7 +54,7 @@
5454
<input type="hidden" name="action" value="delete">
5555
<input type="hidden" name="q" value="{{$.Keyword}}">
5656
<input type="hidden" name="page" value="{{$.CurrentPage}}">
57-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
57+
{{template "base/modal_actions_confirm" (dict "ModalButtonColors" "yellow")}}
5858
</form>
5959
</div>
6060
</div>

‎templates/admin/user/list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<!-- Search Text -->
5656
<div class="ui fluid action input">
57-
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
57+
{{template "shared/searchinput" dict "Value" .Keyword "AutoFocus" true}}
5858
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
5959
</div>
6060
</form>

‎templates/base/modal_actions_confirm.tmpl‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{{/*
2-
Template Attributes:
3-
* locale
4-
52
Two buttons (negative, positive):
63
* ModalButtonTypes: "yes" (default) or "confirm"
74
* ModalButtonColors: "primary" (default) / "blue" / "yellow"
@@ -17,11 +14,11 @@ The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal
1714
{{if .ModalButtonDangerText}}
1815
<button class="ui danger red ok button">{{.ModalButtonDangerText}}</button>
1916
{{else}}
20-
{{$textNegitive := .locale.Tr "modal.no"}}
21-
{{$textPositive := .locale.Tr "modal.yes"}}
17+
{{$textNegitive := ctx.Locale.Tr "modal.no"}}
18+
{{$textPositive := ctx.Locale.Tr "modal.yes"}}
2219
{{if eq .ModalButtonTypes "confirm"}}
23-
{{$textNegitive = .locale.Tr "modal.cancel"}}
24-
{{$textPositive = .locale.Tr "modal.confirm"}}
20+
{{$textNegitive = ctx.Locale.Tr "modal.cancel"}}
21+
{{$textPositive = ctx.Locale.Tr "modal.confirm"}}
2522
{{end}}
2623
{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}}
2724
{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}

‎templates/code/searchform.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<form class="ui form ignore-dirty">
22
<div class="ui fluid action input">
3-
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true "Disabled" .CodeIndexerUnavailable}}
3+
{{template "shared/searchinput" dict "Value" .Keyword "AutoFocus" true "Disabled" .CodeIndexerUnavailable}}
44
<div class="ui dropdown selection {{if .CodeIndexerUnavailable}} disabled{{end}}" data-tooltip-content="{{.locale.Tr "explore.search.type.tooltip"}}">
55
<input name="t" type="hidden" value="{{.queryType}}"{{if .CodeIndexerUnavailable}} disabled{{end}}>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
66
<div class="text">{{.locale.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}</div>

‎templates/devtest/fomantic-modal.tmpl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="header">Form dialog (layout 1)</div>
77
<form class="content" method="post">
88
<div class="ui input gt-w-100"><input name="user_input"></div>
9-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
9+
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
1010
</form>
1111
</div>
1212

@@ -15,7 +15,7 @@
1515
<form method="post">
1616
<div class="content">
1717
<div class="ui input gt-w-100"><input name="user_input"></div>
18-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
18+
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
1919
</div>
2020
</form>
2121
</div>
@@ -26,7 +26,7 @@
2626
<div class="content">
2727
<div class="ui input gt-w-100"><input name="user_input"></div>
2828
</div>
29-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
29+
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
3030
</form>
3131
</div>
3232

@@ -36,7 +36,7 @@
3636
<div class="ui input gt-w-100"><input name="user_input"></div>
3737
</div>
3838
<form method="post">
39-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
39+
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
4040
</form>
4141
</div>
4242

@@ -45,25 +45,25 @@
4545
<div class="content">
4646
very long aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
4747
</div>
48-
{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
48+
{{template "base/modal_actions_confirm"}}
4949
</div>
5050

5151
<div class="ui g-modal-confirm modal" id="test-modal-confirm">
5252
<div class="header">Confirm dialog</div>
5353
<div class="content">hello, this is the modal dialog content</div>
54-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
54+
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
5555
</div>
5656

5757
<div class="ui g-modal-confirm modal" id="test-modal-blue">
5858
<div class="header">Blue dialog</div>
5959
<div class="content">hello, this is the modal dialog content</div>
60-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "blue")}}
60+
{{template "base/modal_actions_confirm" (dict "ModalButtonColors" "blue")}}
6161
</div>
6262

6363
<div class="ui g-modal-confirm modal" id="test-modal-yellow">
6464
<div class="header">yellow dialog</div>
6565
<div class="content">hello, this is the modal dialog content</div>
66-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
66+
{{template "base/modal_actions_confirm" (dict "ModalButtonColors" "yellow")}}
6767
</div>
6868

6969
<div class="ui g-modal-confirm modal" id="test-modal-danger">

‎templates/explore/repo_search.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<input type="hidden" name="sort" value="{{$.SortType}}">
44
<input type="hidden" name="language" value="{{$.Language}}">
55
<div class="ui fluid action input">
6-
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
6+
{{template "shared/searchinput" dict "Value" .Keyword "AutoFocus" true}}
77
{{if .PageIsExploreRepositories}}
88
<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
99
{{else}}

0 commit comments

Comments
 (0)