loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

cleanup locale function usage (#27227)

authored by

Denys Konovalov and committed by
GitHub
2325fe77 3a187eac

+121 -133
+1 -1
templates/admin/base/search.tmpl
··· 1 1 <div class="ui secondary filter menu gt-ac gt-mx-0"> 2 2 <form class="ui form ignore-dirty gt-f1"> 3 3 <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}} 5 5 <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> 6 6 </div> 7 7 </form>
+1 -1
templates/admin/emails/list.tmpl
··· 7 7 <div class="ui secondary filter menu gt-ac gt-mx-0"> 8 8 <form class="ui form ignore-dirty gt-f1"> 9 9 <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}} 11 11 <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> 12 12 </div> 13 13 </form>
+1 -1
templates/admin/packages/list.tmpl
··· 14 14 <div class="ui attached segment"> 15 15 <form class="ui form ignore-dirty"> 16 16 <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}} 18 18 <select class="ui dropdown" name="type"> 19 19 <option value="">{{.locale.Tr "packages.filter.type"}}</option> 20 20 <option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>
+1 -1
templates/admin/repo/search.tmpl
··· 1 1 <div class="ui secondary filter menu gt-ac gt-mx-0"> 2 2 <form class="ui form ignore-dirty gt-f1"> 3 3 <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}} 5 5 <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> 6 6 </div> 7 7 </form>
+2 -2
templates/admin/repo/unadopted.tmpl
··· 37 37 <input type="hidden" name="action" value="adopt"> 38 38 <input type="hidden" name="q" value="{{$.Keyword}}"> 39 39 <input type="hidden" name="page" value="{{$.CurrentPage}}"> 40 - {{template "base/modal_actions_confirm" (dict "locale" $.locale)}} 40 + {{template "base/modal_actions_confirm"}} 41 41 </form> 42 42 </div> 43 43 <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 54 <input type="hidden" name="action" value="delete"> 55 55 <input type="hidden" name="q" value="{{$.Keyword}}"> 56 56 <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")}} 58 58 </form> 59 59 </div> 60 60 </div>
+1 -1
templates/admin/user/list.tmpl
··· 54 54 55 55 <!-- Search Text --> 56 56 <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}} 58 58 <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> 59 59 </div> 60 60 </form>
+4 -7
templates/base/modal_actions_confirm.tmpl
··· 1 1 {{/* 2 - Template Attributes: 3 - * locale 4 - 5 2 Two buttons (negative, positive): 6 3 * ModalButtonTypes: "yes" (default) or "confirm" 7 4 * ModalButtonColors: "primary" (default) / "blue" / "yellow" ··· 17 14 {{if .ModalButtonDangerText}} 18 15 <button class="ui danger red ok button">{{.ModalButtonDangerText}}</button> 19 16 {{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"}} 22 19 {{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"}} 25 22 {{end}} 26 23 {{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}} 27 24 {{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
+1 -1
templates/code/searchform.tmpl
··· 1 1 <form class="ui form ignore-dirty"> 2 2 <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}} 4 4 <div class="ui dropdown selection {{if .CodeIndexerUnavailable}} disabled{{end}}" data-tooltip-content="{{.locale.Tr "explore.search.type.tooltip"}}"> 5 5 <input name="t" type="hidden" value="{{.queryType}}"{{if .CodeIndexerUnavailable}} disabled{{end}}>{{svg "octicon-triangle-down" 14 "dropdown icon"}} 6 6 <div class="text">{{.locale.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}</div>
+8 -8
templates/devtest/fomantic-modal.tmpl
··· 6 6 <div class="header">Form dialog (layout 1)</div> 7 7 <form class="content" method="post"> 8 8 <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")}} 10 10 </form> 11 11 </div> 12 12 ··· 15 15 <form method="post"> 16 16 <div class="content"> 17 17 <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")}} 19 19 </div> 20 20 </form> 21 21 </div> ··· 26 26 <div class="content"> 27 27 <div class="ui input gt-w-100"><input name="user_input"></div> 28 28 </div> 29 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} 29 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 30 30 </form> 31 31 </div> 32 32 ··· 36 36 <div class="ui input gt-w-100"><input name="user_input"></div> 37 37 </div> 38 38 <form method="post"> 39 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} 39 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 40 40 </form> 41 41 </div> 42 42 ··· 45 45 <div class="content"> 46 46 very long aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 47 47 </div> 48 - {{template "base/modal_actions_confirm" (dict "locale" $.locale)}} 48 + {{template "base/modal_actions_confirm"}} 49 49 </div> 50 50 51 51 <div class="ui g-modal-confirm modal" id="test-modal-confirm"> 52 52 <div class="header">Confirm dialog</div> 53 53 <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")}} 55 55 </div> 56 56 57 57 <div class="ui g-modal-confirm modal" id="test-modal-blue"> 58 58 <div class="header">Blue dialog</div> 59 59 <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")}} 61 61 </div> 62 62 63 63 <div class="ui g-modal-confirm modal" id="test-modal-yellow"> 64 64 <div class="header">yellow dialog</div> 65 65 <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")}} 67 67 </div> 68 68 69 69 <div class="ui g-modal-confirm modal" id="test-modal-danger">
+1 -1
templates/explore/repo_search.tmpl
··· 3 3 <input type="hidden" name="sort" value="{{$.SortType}}"> 4 4 <input type="hidden" name="language" value="{{$.Language}}"> 5 5 <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}} 7 7 {{if .PageIsExploreRepositories}} 8 8 <input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}"> 9 9 {{else}}
+1 -1
templates/explore/search.tmpl
··· 1 1 <div class="ui secondary filter menu gt-ac gt-mx-0"> 2 2 <form class="ui form ignore-dirty gt-f1"> 3 3 <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}} 5 5 <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> 6 6 </div> 7 7 </form>
+1 -1
templates/package/shared/list.tmpl
··· 1 1 {{template "base/alert" .}} 2 2 <form class="ui form ignore-dirty"> 3 3 <div class="ui fluid action input"> 4 - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} 4 + {{template "shared/searchinput" dict "Value" .Query "AutoFocus" true}} 5 5 <select class="ui dropdown" name="type"> 6 6 <option value="">{{.locale.Tr "packages.filter.type"}}</option> 7 7 <option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>
+1 -1
templates/package/shared/versionlist.tmpl
··· 1 1 <p><a href="{{.PackageDescriptor.PackageWebLink}}">{{.PackageDescriptor.Package.Name}}</a> / <strong>{{.locale.Tr "packages.versions"}}</strong></p> 2 2 <form class="ui form ignore-dirty"> 3 3 <div class="ui fluid action input"> 4 - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} 4 + {{template "shared/searchinput" dict "Value" .Query "AutoFocus" true}} 5 5 <select class="ui dropdown" name="sort"> 6 6 <option value="version_asc"{{if eq .Sort "version_asc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.asc"}}</option> 7 7 <option value="version_desc"{{if eq .Sort "version_desc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.desc"}}</option>
+1 -1
templates/projects/list.tmpl
··· 23 23 <form class="list-header-search ui form ignore-dirty"> 24 24 <div class="ui small search fluid action input"> 25 25 <input type="hidden" name="state" value="{{$.State}}"> 26 - {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword}} 26 + {{template "shared/searchinput" dict "Value" .Keyword}} 27 27 <button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}"> 28 28 {{svg "octicon-search"}} 29 29 </button>
+2 -2
templates/projects/view.tmpl
··· 142 142 <div class="content"> 143 143 <label id="default-project-column-content"></label> 144 144 </div> 145 - {{template "base/modal_actions_confirm" (dict "locale" ctx.Locale "ModalButtonTypes" "confirm")}} 145 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 146 146 </div> 147 147 148 148 <div class="ui g-modal-confirm modal" id="delete-project-column-modal-{{.ID}}"> ··· 154 154 {{ctx.Locale.Tr "repo.projects.column.deletion_desc"}} 155 155 </label> 156 156 </div> 157 - {{template "base/modal_actions_confirm" (dict "locale" ctx.Locale "ModalButtonTypes" "confirm")}} 157 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 158 158 </div> 159 159 </div> 160 160 </div>
+1 -1
templates/repo/actions/runs_list.tmpl
··· 8 8 {{range .Runs}} 9 9 <div class="flex-item gt-ac"> 10 10 <div class="flex-item-leading"> 11 - {{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}} 11 + {{template "repo/actions/status" (dict "status" .Status.String)}} 12 12 </div> 13 13 <div class="flex-item-main"> 14 14 <a class="flex-item-title" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
+1 -1
templates/repo/actions/status.tmpl
··· 12 12 {{- $className = .className -}} 13 13 {{- end -}} 14 14 15 - <span class="gt-df gt-ac" data-tooltip-content="{{.locale.Tr (printf "actions.status.%s" .status)}}"> 15 + <span class="gt-df gt-ac" data-tooltip-content="{{ctx.Locale.Tr (printf "actions.status.%s" .status)}}"> 16 16 {{if eq .status "success"}} 17 17 {{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}} 18 18 {{else if eq .status "skipped"}}
+1 -1
templates/repo/blame.tmpl
··· 64 64 {{if $.EscapeStatus.Escaped}} 65 65 <td class="lines-escape"> 66 66 {{if $row.EscapeStatus.Escaped}} 67 - <button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $row "locale" $.locale}}"></button> 67 + <button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $row}}"></button> 68 68 {{end}} 69 69 </td> 70 70 {{end}}
+2 -2
templates/repo/branch/list.tmpl
··· 236 236 <input id="new_branch_name" name="new_branch_name" required> 237 237 </div> 238 238 </div> 239 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} 239 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 240 240 </form> 241 241 </div> 242 242 ··· 258 258 <input name="to" required> 259 259 </div> 260 260 </div> 261 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} 261 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 262 262 </form> 263 263 </div> 264 264 {{template "base/footer" .}}
+1 -1
templates/repo/commit_statuses.tmpl
··· 14 14 {{template "repo/commit_status" .}} 15 15 <span class="ui gt-ml-3 gt-f1">{{.Context}} <span class="text grey">{{.Description}}</span></span> 16 16 {{if .TargetURL}} 17 - <a class="gt-ml-3" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer">{{$.root.locale.Tr "repo.pulls.status_checks_details"}}</a> 17 + <a class="gt-ml-3" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer">{{ctx.Locale.Tr "repo.pulls.status_checks_details"}}</a> 18 18 {{end}} 19 19 </div> 20 20 {{end}}
+7 -7
templates/repo/diff/blob_excerpt.tmpl
··· 22 22 </div> 23 23 </td> 24 24 <td colspan="7" class="lines-code lines-code-old ">{{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}}{{/* 25 - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}}</td> 25 + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td> 26 26 {{else}} 27 27 {{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}} 28 28 <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$.FileNameHash}}L{{$line.LeftIdx}}{{end}}"></span></td> 29 - <td class="blob-excerpt lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.locale}}"></button>{{end}}</td> 29 + <td class="blob-excerpt lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> 30 30 <td class="blob-excerpt lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="gt-mono" data-type-marker=""></span>{{end}}</td> 31 31 <td class="blob-excerpt lines-code lines-code-old">{{/* 32 - */}}{{if $line.LeftIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}}{{else}}{{/* 32 + */}}{{if $line.LeftIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{else}}{{/* 33 33 */}}<code class="code-inner"></code>{{/* 34 34 */}}{{end}}{{/* 35 35 */}}</td> 36 36 <td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$.FileNameHash}}R{{$line.RightIdx}}{{end}}"></span></td> 37 - <td class="blob-excerpt lines-escape lines-escape-new">{{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.locale}}"></button>{{end}}</td> 37 + <td class="blob-excerpt lines-escape lines-escape-new">{{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> 38 38 <td class="blob-excerpt lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="gt-mono" data-type-marker=""></span>{{end}}</td> 39 39 <td class="blob-excerpt lines-code lines-code-new">{{/* 40 - */}}{{if $line.RightIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}}{{else}}{{/* 40 + */}}{{if $line.RightIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{else}}{{/* 41 41 */}}<code class="code-inner"></code>{{/* 42 42 */}}{{end}}{{/* 43 43 */}}</td> ··· 72 72 <td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$.FileNameHash}}R{{$line.RightIdx}}{{end}}"></span></td> 73 73 {{end}} 74 74 {{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}} 75 - <td class="blob-excerpt lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.locale}}"></button>{{end}}</td> 75 + <td class="blob-excerpt lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> 76 76 <td class="blob-excerpt lines-type-marker"><span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td> 77 - <td class="blob-excerpt lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.locale}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td> 77 + <td class="blob-excerpt lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td> 78 78 </tr> 79 79 {{end}} 80 80 {{end}}
-1
templates/repo/diff/box.tmpl
··· 225 225 <template id="issue-comment-editor-template"> 226 226 <div class="ui comment form"> 227 227 {{template "shared/combomarkdowneditor" (dict 228 - "locale" $.locale 229 228 "MarkdownPreviewUrl" (print $.Repository.Link "/markup") 230 229 "MarkdownPreviewContext" $.RepoLink 231 230 "TextareaName" "content"
+6 -7
templates/repo/diff/comment_form.tmpl
··· 11 11 <input type="hidden" name="diff_base_cid"> 12 12 13 13 {{template "shared/combomarkdowneditor" (dict 14 - "locale" $.root.locale 15 14 "MarkdownPreviewUrl" (print $.root.Repository.Link "/markup") 16 15 "MarkdownPreviewContext" $.root.RepoLink 17 16 "TextareaName" "content" ··· 21 20 )}} 22 21 23 22 <div class="field footer gt-mx-3"> 24 - <span class="markup-info">{{svg "octicon-markup"}} {{$.root.locale.Tr "repo.diff.comment.markdown_info"}}</span> 23 + <span class="markup-info">{{svg "octicon-markup"}} {{ctx.Locale.Tr "repo.diff.comment.markdown_info"}}</span> 25 24 <div class="gt-text-right"> 26 25 {{if $.reply}} 27 - <button class="ui submit primary tiny button btn-reply" type="submit">{{$.root.locale.Tr "repo.diff.comment.reply"}}</button> 26 + <button class="ui submit primary tiny button btn-reply" type="submit">{{ctx.Locale.Tr "repo.diff.comment.reply"}}</button> 28 27 <input type="hidden" name="reply" value="{{$.reply}}"> 29 28 <input type="hidden" name="single_review" value="true"> 30 29 {{else}} 31 30 {{if $.root.CurrentReview}} 32 - <button name="pending_review" type="submit" class="ui submit primary tiny button btn-add-comment">{{$.root.locale.Tr "repo.diff.comment.add_review_comment"}}</button> 31 + <button name="pending_review" type="submit" class="ui submit primary tiny button btn-add-comment">{{ctx.Locale.Tr "repo.diff.comment.add_review_comment"}}</button> 33 32 {{else}} 34 - <button name="pending_review" type="submit" class="ui submit primary tiny button btn-start-review">{{$.root.locale.Tr "repo.diff.comment.start_review"}}</button> 35 - <button name="single_review" value="true" type="submit" class="ui submit tiny basic button btn-add-single">{{$.root.locale.Tr "repo.diff.comment.add_single_comment"}}</button> 33 + <button name="pending_review" type="submit" class="ui submit primary tiny button btn-start-review">{{ctx.Locale.Tr "repo.diff.comment.start_review"}}</button> 34 + <button name="single_review" value="true" type="submit" class="ui submit tiny basic button btn-add-single">{{ctx.Locale.Tr "repo.diff.comment.add_single_comment"}}</button> 36 35 {{end}} 37 36 {{end}} 38 37 {{if or (not $.HasComments) $.hidden}} 39 - <button type="button" class="ui submit tiny basic button btn-cancel cancel-code-comment">{{$.root.locale.Tr "cancel"}}</button> 38 + <button type="button" class="ui submit tiny basic button btn-cancel cancel-code-comment">{{ctx.Locale.Tr "cancel"}}</button> 40 39 {{end}} 41 40 </div> 42 41 </div>
+9 -9
templates/repo/diff/comments.tmpl
··· 16 16 {{.OriginalAuthor}} 17 17 </span> 18 18 <span class="text grey muted-links"> 19 - {{$.root.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} 19 + {{ctx.Locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} 20 20 </span> 21 21 <span class="text migrate"> 22 22 {{if $.root.Repository.OriginalURL}} 23 - ({{$.root.locale.Tr "repo.migrated_from" ($.root.Repository.OriginalURL | Escape) ($.root.Repository.GetOriginalURLHostname | Escape) | Safe}}) 23 + ({{ctx.Locale.Tr "repo.migrated_from" ($.root.Repository.OriginalURL | Escape) ($.root.Repository.GetOriginalURLHostname | Escape) | Safe}}) 24 24 {{end}} 25 25 </span> 26 26 {{else}} 27 27 <span class="text grey muted-links"> 28 28 {{template "shared/user/namelink" .Poster}} 29 - {{$.root.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} 29 + {{ctx.Locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} 30 30 </span> 31 31 {{end}} 32 32 </div> 33 33 <div class="comment-header-right actions gt-df gt-ac"> 34 34 {{if .Invalidated}} 35 35 {{$referenceUrl := printf "%s#%s" $.root.Issue.Link .HashTag}} 36 - <a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small" data-tooltip-content="{{$.root.locale.Tr "repo.issues.review.outdated_description"}}"> 37 - {{$.root.locale.Tr "repo.issues.review.outdated"}} 36 + <a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> 37 + {{ctx.Locale.Tr "repo.issues.review.outdated"}} 38 38 </a> 39 39 {{end}} 40 40 {{if and .Review}} 41 41 {{if eq .Review.Type 0}} 42 - <div class="ui label basic small yellow pending-label" data-tooltip-content="{{$.root.locale.Tr "repo.issues.review.pending.tooltip" ($.root.locale.Tr "repo.diff.review") ($.root.locale.Tr "repo.diff.review.approve") ($.root.locale.Tr "repo.diff.review.comment") ($.root.locale.Tr "repo.diff.review.reject")}}"> 43 - {{$.root.locale.Tr "repo.issues.review.pending"}} 42 + <div class="ui label basic small yellow pending-label" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.pending.tooltip" (ctx.Locale.Tr "repo.diff.review") (ctx.Locale.Tr "repo.diff.review.approve") (ctx.Locale.Tr "repo.diff.review.comment") (ctx.Locale.Tr "repo.diff.review.reject")}}"> 43 + {{ctx.Locale.Tr "repo.issues.review.pending"}} 44 44 </div> 45 45 {{else}} 46 46 <div class="ui label basic small"> 47 - {{$.root.locale.Tr "repo.issues.review.review"}} 47 + {{ctx.Locale.Tr "repo.issues.review.review"}} 48 48 </div> 49 49 {{end}} 50 50 {{end}} ··· 57 57 {{if .RenderedContent}} 58 58 {{.RenderedContent|Str2html}} 59 59 {{else}} 60 - <span class="no-content">{{$.root.locale.Tr "repo.issues.no_content"}}</span> 60 + <span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span> 61 61 {{end}} 62 62 </div> 63 63 <div id="issuecomment-{{.ID}}-raw" class="raw-content gt-hidden">{{.Content}}</div>
+2 -2
templates/repo/diff/escape_title.tmpl
··· 1 - {{if .diff.EscapeStatus.HasInvisible}}{{.locale.Tr "repo.invisible_runes_line"}} {{end}}{{/* 2 - */}}{{if .diff.EscapeStatus.HasAmbiguous}}{{.locale.Tr "repo.ambiguous_runes_line"}}{{end}} 1 + {{if .diff.EscapeStatus.HasInvisible}}{{ctx.Locale.Tr "repo.invisible_runes_line"}} {{end}}{{/* 2 + */}}{{if .diff.EscapeStatus.HasAmbiguous}}{{ctx.Locale.Tr "repo.ambiguous_runes_line"}}{{end}}
-1
templates/repo/diff/new_review.tmpl
··· 16 16 </div> 17 17 <div class="field"> 18 18 {{template "shared/combomarkdowneditor" (dict 19 - "locale" $.locale 20 19 "MarkdownPreviewUrl" (print .Repository.Link "/markup") 21 20 "MarkdownPreviewContext" .RepoLink 22 21 "TextareaName" "content"
+14 -14
templates/repo/diff/section_split.tmpl
··· 34 34 {{end}} 35 35 </div> 36 36 </td>{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale}} 37 - <td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}</td> 37 + <td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> 38 38 <td colspan="6" class="lines-code lines-code-old ">{{/* 39 - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* 39 + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{/* 40 40 */}}</td> 41 41 {{else if and (eq .GetType 3) $hasmatch}}{{/* DEL */}} 42 42 {{$match := index $section.Lines $line.Match}} 43 43 {{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line $.root.locale}}{{end}} 44 44 {{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match $.root.locale}}{{end}} 45 45 <td class="lines-num lines-num-old del-code" data-line-num="{{$line.LeftIdx}}"><span rel="diff-{{$file.NameHash}}L{{$line.LeftIdx}}"></span></td> 46 - <td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $leftDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td> 46 + <td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $leftDiff}}"></button>{{end}}{{end}}</td> 47 47 <td class="lines-type-marker lines-type-marker-old del-code"><span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td> 48 48 <td class="lines-code lines-code-old del-code">{{/* 49 49 */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* 50 - */}}<button type="button" aria-label="{{$.root.locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/* 50 + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/* 51 51 */}}{{svg "octicon-plus"}}{{/* 52 52 */}}</button>{{/* 53 53 */}}{{end}}{{/* 54 54 */}}{{if $line.LeftIdx}}{{/* 55 - */}}{{template "repo/diff/section_code" dict "diff" $leftDiff "locale" $.root.locale}}{{/* 55 + */}}{{template "repo/diff/section_code" dict "diff" $leftDiff}}{{/* 56 56 */}}{{else}}{{/* 57 57 */}}<code class="code-inner"></code>{{/* 58 58 */}}{{end}}{{/* 59 59 */}}</td> 60 60 <td class="lines-num lines-num-new add-code" data-line-num="{{if $match.RightIdx}}{{$match.RightIdx}}{{end}}"><span rel="{{if $match.RightIdx}}diff-{{$file.NameHash}}R{{$match.RightIdx}}{{end}}"></span></td> 61 - <td class="lines-escape add-code lines-escape-new">{{if $match.RightIdx}}{{if $rightDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $rightDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td> 61 + <td class="lines-escape add-code lines-escape-new">{{if $match.RightIdx}}{{if $rightDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $rightDiff}}"></button>{{end}}{{end}}</td> 62 62 <td class="lines-type-marker lines-type-marker-new add-code">{{if $match.RightIdx}}<span class="gt-mono" data-type-marker="{{$match.GetLineTypeMarker}}"></span>{{end}}</td> 63 63 <td class="lines-code lines-code-new add-code">{{/* 64 64 */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* 65 - */}}<button type="button" aria-label="{{$.root.locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $match.CanComment)}} gt-invisible{{end}}" data-side="right" data-idx="{{$match.RightIdx}}">{{/* 65 + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $match.CanComment)}} gt-invisible{{end}}" data-side="right" data-idx="{{$match.RightIdx}}">{{/* 66 66 */}}{{svg "octicon-plus"}}{{/* 67 67 */}}</button>{{/* 68 68 */}}{{end}}{{/* 69 69 */}}{{if $match.RightIdx}}{{/* 70 - */}}{{template "repo/diff/section_code" dict "diff" $rightDiff "locale" $.root.locale}}{{/* 70 + */}}{{template "repo/diff/section_code" dict "diff" $rightDiff}}{{/* 71 71 */}}{{else}}{{/* 72 72 */}}<code class="code-inner"></code>{{/* 73 73 */}}{{end}}{{/* ··· 75 75 {{else}} 76 76 {{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale}} 77 77 <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td> 78 - <td class="lines-escape lines-escape-old">{{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td> 78 + <td class="lines-escape lines-escape-old">{{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}{{end}}</td> 79 79 <td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td> 80 80 <td class="lines-code lines-code-old">{{/* 81 81 */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2))}}{{/* 82 - */}}<button type="button" aria-label="{{$.root.locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/* 82 + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/* 83 83 */}}{{svg "octicon-plus"}}{{/* 84 84 */}}</button>{{/* 85 85 */}}{{end}}{{/* 86 86 */}}{{if $line.LeftIdx}}{{/* 87 - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* 87 + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{/* 88 88 */}}{{else}}{{/* 89 89 */}}<code class="code-inner"></code>{{/* 90 90 */}}{{end}}{{/* 91 91 */}}</td> 92 92 <td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$file.NameHash}}R{{$line.RightIdx}}{{end}}"></span></td> 93 - <td class="lines-escape lines-escape-new">{{if $line.RightIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td> 93 + <td class="lines-escape lines-escape-new">{{if $line.RightIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}{{end}}</td> 94 94 <td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td> 95 95 <td class="lines-code lines-code-new">{{/* 96 96 */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 3))}}{{/* 97 - */}}<button type="button" aria-label="{{$.root.locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">{{/* 97 + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">{{/* 98 98 */}}{{svg "octicon-plus"}}{{/* 99 99 */}}</button>{{/* 100 100 */}}{{end}}{{/* 101 101 */}}{{if $line.RightIdx}}{{/* 102 - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* 102 + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{/* 103 103 */}}{{else}}{{/* 104 104 */}}<code class="code-inner"></code>{{/* 105 105 */}}{{end}}{{/*
+4 -4
templates/repo/diff/section_unified.tmpl
··· 41 41 {{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale -}} 42 42 <td class="lines-escape"> 43 43 {{- if $inlineDiff.EscapeStatus.Escaped -}} 44 - <button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button> 44 + <button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button> 45 45 {{- end -}} 46 46 </td> 47 47 <td class="lines-type-marker"><span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td> 48 48 {{if eq .GetType 4}} 49 49 <td class="chroma lines-code blob-hunk">{{/* 50 - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* 50 + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{/* 51 51 */}}</td> 52 52 {{else}} 53 53 <td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{/* 54 54 */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* 55 - */}}<button type="button" aria-label="{{$.root.locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/* 55 + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} gt-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/* 56 56 */}}{{svg "octicon-plus"}}{{/* 57 57 */}}</button>{{/* 58 58 */}}{{end}}{{/* 59 - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* 59 + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{/* 60 60 */}}</td> 61 61 {{end}} 62 62 </tr>
-1
templates/repo/issue/comment_tab.tmpl
··· 5 5 6 6 <div class="field"> 7 7 {{template "shared/combomarkdowneditor" (dict 8 - "locale" $.locale 9 8 "MarkdownPreviewUrl" (print .Repository.Link "/markup") 10 9 "MarkdownPreviewContext" .RepoLink 11 10 "TextareaName" "content"
-1
templates/repo/issue/fields/textarea.tmpl
··· 7 7 8 8 {{if $useMarkdownEditor}} 9 9 {{template "shared/combomarkdowneditor" (dict 10 - "locale" .root.locale 11 10 "ContainerClasses" "gt-hidden" 12 11 "MarkdownPreviewUrl" (print .root.RepoLink "/markup") 13 12 "MarkdownPreviewContext" .root.RepoLink
+1 -1
templates/repo/issue/milestones.tmpl
··· 26 26 <form class="list-header-search ui form ignore-dirty"> 27 27 <div class="ui small search fluid action input"> 28 28 <input type="hidden" name="state" value="{{$.State}}"> 29 - {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword}} 29 + {{template "shared/searchinput" dict "Value" .Keyword}} 30 30 <button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}"> 31 31 {{svg "octicon-search"}} 32 32 </button>
+1 -1
templates/repo/issue/search.tmpl
··· 7 7 <input type="hidden" name="project" value="{{$.ProjectID}}"> 8 8 <input type="hidden" name="assignee" value="{{$.AssigneeID}}"> 9 9 <input type="hidden" name="poster" value="{{$.PosterID}}"> 10 - {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword}} 10 + {{template "shared/searchinput" dict "Value" .Keyword}} 11 11 {{if .PageIsIssueList}} 12 12 <button id="issue-list-quick-goto" class="ui small icon button gt-hidden" data-tooltip-content="{{.locale.Tr "explore.go_to"}}" data-repo-link="{{.RepoLink}}">{{svg "octicon-hash"}}</button> 13 13 {{end}}
-1
templates/repo/issue/view_content.tmpl
··· 147 147 <div class="ui comment form"> 148 148 <div class="field"> 149 149 {{template "shared/combomarkdowneditor" (dict 150 - "locale" $.locale 151 150 "MarkdownPreviewUrl" (print .Repository.Link "/markup") 152 151 "MarkdownPreviewContext" .RepoLink 153 152 "TextareaName" "content"
+1 -1
templates/repo/issue/view_content/comments_delete_time.tmpl
··· 7 7 {{.ctxData.CsrfTokenHtml}} 8 8 </form> 9 9 <div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div> 10 - {{template "base/modal_actions_confirm" (dict "locale" .ctxData.locale)}} 10 + {{template "base/modal_actions_confirm"}} 11 11 </div> 12 12 <button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}"> 13 13 {{svg "octicon-trash"}}
+1 -1
templates/repo/issue/view_content/pull.tmpl
··· 373 373 {{end}} 374 374 375 375 {{if and .ShowMergeInstructions .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}} 376 - {{template "repo/issue/view_content/pull_merge_instruction" (dict "locale" .locale "Issue" .Issue)}} 376 + {{template "repo/issue/view_content/pull_merge_instruction" .Issue.PullRequest}} 377 377 {{end}} 378 378 </div> 379 379 </div>
+10 -10
templates/repo/issue/view_content/pull_merge_instruction.tmpl
··· 1 1 <div class="divider"></div> 2 - <div class="instruct-toggle"> {{$.locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div> 2 + <div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div> 3 3 <div class="instruct-content gt-mt-3 gt-hidden"> 4 - <div><h3 class="gt-dib">{{$.locale.Tr "step1"}}</h3> {{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> 4 + <div><h3 class="gt-dib">{{ctx.Locale.Tr "step1"}}</h3> {{ctx.Locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> 5 5 <div class="ui secondary segment"> 6 - {{if eq $.Issue.PullRequest.Flow 0}} 7 - <div>git checkout -b {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}} {{$.Issue.PullRequest.BaseBranch}}</div> 8 - <div>git pull {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}<gitea-origin-url data-url="{{$.Issue.PullRequest.HeadRepo.Link}}"></gitea-origin-url>{{else}}origin{{end}} {{$.Issue.PullRequest.HeadBranch}}</div> 6 + {{if eq .Flow 0}} 7 + <div>git checkout -b {{if ne .HeadRepo.ID .BaseRepo.ID}}{{.HeadRepo.OwnerName}}-{{end}}{{.HeadBranch}} {{.BaseBranch}}</div> 8 + <div>git pull {{if ne .HeadRepo.ID .BaseRepo.ID}}<gitea-origin-url data-url="{{.HeadRepo.Link}}"></gitea-origin-url>{{else}}origin{{end}} {{.HeadBranch}}</div> 9 9 {{else}} 10 - <div>git fetch origin {{$.Issue.PullRequest.GetGitRefName}}:{{$.Issue.PullRequest.HeadBranch}}</div> 10 + <div>git fetch origin {{.GetGitRefName}}:{{.HeadBranch}}</div> 11 11 {{end}} 12 12 </div> 13 - <div><h3 class="gt-dib">{{$.locale.Tr "step2"}}</h3> {{$.locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> 13 + <div><h3 class="gt-dib">{{ctx.Locale.Tr "step2"}}</h3> {{ctx.Locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> 14 14 <div class="ui secondary segment"> 15 - <div>git checkout {{$.Issue.PullRequest.BaseBranch}}</div> 16 - <div>git merge --no-ff {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}}</div> 17 - <div>git push origin {{$.Issue.PullRequest.BaseBranch}}</div> 15 + <div>git checkout {{.BaseBranch}}</div> 16 + <div>git merge --no-ff {{if ne .HeadRepo.ID .BaseRepo.ID}}{{.HeadRepo.OwnerName}}-{{end}}{{.HeadBranch}}</div> 17 + <div>git push origin {{.BaseBranch}}</div> 18 18 </div> 19 19 </div>
-1
templates/repo/release/new.tmpl
··· 50 50 </div> 51 51 <div class="field"> 52 52 {{template "shared/combomarkdowneditor" (dict 53 - "locale" $.locale 54 53 "MarkdownPreviewUrl" (print .Repository.Link "/markup") 55 54 "MarkdownPreviewContext" .RepoLink 56 55 "TextareaName" "content"
+1 -1
templates/repo/settings/lfs.tmpl
··· 44 44 </p> 45 45 <form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post"> 46 46 {{$.CsrfTokenHtml}} 47 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}} 47 + {{template "base/modal_actions_confirm" (dict "ModalButtonColors" "yellow")}} 48 48 </form> 49 49 </div> 50 50 </div>
+3 -3
templates/repo/shabox_badge.tmpl
··· 1 1 <div class="ui detail icon button"> 2 2 {{if .verification.Verified}} 3 - <div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{$.root.locale.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{$.root.locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}"> 3 + <div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}"> 4 4 {{if ne .verification.SigningUser.ID 0}} 5 5 {{svg "gitea-lock"}} 6 6 {{ctx.AvatarUtils.Avatar .verification.SigningUser 28 "signature"}} 7 7 {{else}} 8 - <span title="{{$.root.locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span> 8 + <span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span> 9 9 {{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 28 "signature"}} 10 10 {{end}} 11 11 </div> 12 12 {{else}} 13 - <span title="{{$.root.locale.Tr .verification.Reason}}">{{svg "gitea-unlock"}}</span> 13 + <span title="{{ctx.Locale.Tr .verification.Reason}}">{{svg "gitea-unlock"}}</span> 14 14 {{end}} 15 15 </div>
+5 -5
templates/repo/unicode_escape_prompt.tmpl
··· 3 3 <div class="ui warning message unicode-escape-prompt gt-text-left"> 4 4 <button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button> 5 5 <div class="header"> 6 - {{$.root.locale.Tr "repo.invisible_runes_header"}} 6 + {{ctx.Locale.Tr "repo.invisible_runes_header"}} 7 7 </div> 8 - <p>{{$.root.locale.Tr "repo.invisible_runes_description" | Str2html}}</p> 8 + <p>{{ctx.Locale.Tr "repo.invisible_runes_description" | Str2html}}</p> 9 9 {{if .EscapeStatus.HasAmbiguous}} 10 - <p>{{$.root.locale.Tr "repo.ambiguous_runes_description" | Str2html}}</p> 10 + <p>{{ctx.Locale.Tr "repo.ambiguous_runes_description" | Str2html}}</p> 11 11 {{end}} 12 12 </div> 13 13 {{else if .EscapeStatus.HasAmbiguous}} 14 14 <div class="ui warning message unicode-escape-prompt gt-text-left"> 15 15 <button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button> 16 16 <div class="header"> 17 - {{$.root.locale.Tr "repo.ambiguous_runes_header"}} 17 + {{ctx.Locale.Tr "repo.ambiguous_runes_header"}} 18 18 </div> 19 - <p>{{$.root.locale.Tr "repo.ambiguous_runes_description" | Str2html}}</p> 19 + <p>{{ctx.Locale.Tr "repo.ambiguous_runes_description" | Str2html}}</p> 20 20 </div> 21 21 {{end}} 22 22 {{end}}
-1
templates/repo/wiki/new.tmpl
··· 23 23 {{$content = .locale.Tr "repo.wiki.welcome"}} 24 24 {{end}} 25 25 {{template "shared/combomarkdowneditor" (dict 26 - "locale" $.locale 27 26 "MarkdownPreviewUrl" (print .Repository.Link "/markup") 28 27 "MarkdownPreviewContext" .RepoLink 29 28 "TextareaName" "content"
+1 -1
templates/shared/actions/runner_list.tmpl
··· 35 35 <form class="ui form ignore-dirty" id="user-list-search-form" action="{{$.Link}}"> 36 36 <!-- Search Text --> 37 37 <div class="ui fluid action input"> 38 - {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} 38 + {{template "shared/searchinput" dict "Value" .Keyword "AutoFocus" true}} 39 39 <button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button> 40 40 </div> 41 41 </form>
+16 -17
templates/shared/combomarkdowneditor.tmpl
··· 1 1 {{/* 2 2 Template Attributes: 3 - * locale: passed through for localization 4 3 * ContainerId: id attribute for the container element 5 4 * ContainerClasses: additional classes for the container element 6 5 * MarkdownPreviewUrl: preview url for the preview tab ··· 15 14 <div {{if .ContainerId}}id="{{.ContainerId}}"{{end}} class="combo-markdown-editor {{.ContainerClasses}}" data-dropzone-parent-container="{{.DropzoneParentContainer}}"> 16 15 {{if .MarkdownPreviewUrl}} 17 16 <div class="ui top tabular menu"> 18 - <a class="active item" data-tab-for="markdown-writer">{{.locale.Tr "write"}}</a> 19 - <a class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{.locale.Tr "preview"}}</a> 17 + <a class="active item" data-tab-for="markdown-writer">{{ctx.Locale.Tr "write"}}</a> 18 + <a class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{ctx.Locale.Tr "preview"}}</a> 20 19 </div> 21 20 {{end}} 22 21 <div class="ui tab active" data-tab-panel="markdown-writer"> 23 22 <markdown-toolbar> 24 23 <div class="markdown-toolbar-group"> 25 - <md-header class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.heading.tooltip"}}">{{svg "octicon-heading"}}</md-header> 26 - <md-bold class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.bold.tooltip"}}">{{svg "octicon-bold"}}</md-bold> 27 - <md-italic class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.italic.tooltip"}}">{{svg "octicon-italic"}}</md-italic> 24 + <md-header class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.heading.tooltip"}}">{{svg "octicon-heading"}}</md-header> 25 + <md-bold class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.bold.tooltip"}}">{{svg "octicon-bold"}}</md-bold> 26 + <md-italic class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.italic.tooltip"}}">{{svg "octicon-italic"}}</md-italic> 28 27 </div> 29 28 <div class="markdown-toolbar-group"> 30 - <md-quote class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.quote.tooltip"}}">{{svg "octicon-quote"}}</md-quote> 31 - <md-code class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.code.tooltip"}}">{{svg "octicon-code"}}</md-code> 32 - <md-link class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.link.tooltip"}}">{{svg "octicon-link"}}</md-link> 29 + <md-quote class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.quote.tooltip"}}">{{svg "octicon-quote"}}</md-quote> 30 + <md-code class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.code.tooltip"}}">{{svg "octicon-code"}}</md-code> 31 + <md-link class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.link.tooltip"}}">{{svg "octicon-link"}}</md-link> 33 32 </div> 34 33 <div class="markdown-toolbar-group"> 35 - <md-unordered-list class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.list.unordered.tooltip"}}">{{svg "octicon-list-unordered"}}</md-unordered-list> 36 - <md-ordered-list class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.list.ordered.tooltip"}}">{{svg "octicon-list-ordered"}}</md-ordered-list> 37 - <md-task-list class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.list.task.tooltip"}}">{{svg "octicon-tasklist"}}</md-task-list> 34 + <md-unordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.unordered.tooltip"}}">{{svg "octicon-list-unordered"}}</md-unordered-list> 35 + <md-ordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.ordered.tooltip"}}">{{svg "octicon-list-ordered"}}</md-ordered-list> 36 + <md-task-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.task.tooltip"}}">{{svg "octicon-tasklist"}}</md-task-list> 38 37 </div> 39 38 <div class="markdown-toolbar-group"> 40 - <md-mention class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.mention.tooltip"}}">{{svg "octicon-mention"}}</md-mention> 41 - <md-ref class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.ref.tooltip"}}">{{svg "octicon-cross-reference"}}</md-ref> 39 + <md-mention class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.mention.tooltip"}}">{{svg "octicon-mention"}}</md-mention> 40 + <md-ref class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.ref.tooltip"}}">{{svg "octicon-cross-reference"}}</md-ref> 42 41 </div> 43 42 <div class="markdown-toolbar-group"> 44 - <button class="markdown-toolbar-button markdown-switch-monospace" role="switch" data-enable-text="{{.locale.Tr "editor.buttons.enable_monospace_font"}}" data-disable-text="{{.locale.Tr "editor.buttons.disable_monospace_font"}}">{{svg "octicon-typography"}}</button> 45 - <button class="markdown-toolbar-button markdown-switch-easymde" data-tooltip-content="{{.locale.Tr "editor.buttons.switch_to_legacy.tooltip"}}">{{svg "octicon-arrow-switch"}}</button> 43 + <button class="markdown-toolbar-button markdown-switch-monospace" role="switch" data-enable-text="{{ctx.Locale.Tr "editor.buttons.enable_monospace_font"}}" data-disable-text="{{ctx.Locale.Tr "editor.buttons.disable_monospace_font"}}">{{svg "octicon-typography"}}</button> 44 + <button class="markdown-toolbar-button markdown-switch-easymde" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.switch_to_legacy.tooltip"}}">{{svg "octicon-arrow-switch"}}</button> 46 45 </div> 47 46 </markdown-toolbar> 48 47 <text-expander keys=": @" suffix=""> ··· 55 54 </script> 56 55 </div> 57 56 <div class="ui tab markup" data-tab-panel="markdown-previewer"> 58 - {{.locale.Tr "loading"}} 57 + {{ctx.Locale.Tr "loading"}} 59 58 </div> 60 59 </div>
+1 -1
templates/shared/searchinput.tmpl
··· 1 - <input type="search" spellcheck="false" name="q" maxlength="255" placeholder="{{.locale.Tr "explore.search"}}…"{{if .Value}} value="{{.Value}}"{{end}}{{if .AutoFocus}} autofocus{{end}}{{if .Disabled}} disabled{{end}}> 1 + <input type="search" spellcheck="false" name="q" maxlength="255" placeholder="{{ctx.Locale.Tr "explore.search"}}…"{{if .Value}} value="{{.Value}}"{{end}}{{if .AutoFocus}} autofocus{{end}}{{if .Disabled}} disabled{{end}}>
+1 -1
templates/shared/secrets/add_list.tmpl
··· 76 76 ></textarea> 77 77 </div> 78 78 </div> 79 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} 79 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 80 80 </form> 81 81 </div>
+1 -1
templates/shared/variables/variable_list.tmpl
··· 86 86 ></textarea> 87 87 </div> 88 88 </div> 89 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} 89 + {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} 90 90 </form> 91 91 </div> 92 92
+1 -1
templates/user/dashboard/issues.tmpl
··· 77 77 <input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}},{{end}}]"> 78 78 <input type="hidden" name="sort" value="{{$.SortType}}"> 79 79 <input type="hidden" name="state" value="{{$.State}}"> 80 - {{template "shared/searchinput" dict "locale" .locale "Value" $.Keyword}} 80 + {{template "shared/searchinput" dict "Value" $.Keyword}} 81 81 <button id="issue-list-quick-goto" class="ui small icon button gt-hidden" data-tooltip-content="{{.locale.Tr "explore.go_to"}}">{{svg "octicon-hash"}}</button> 82 82 <button class="ui small icon button" aria-label="{{.locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button> 83 83 </div>
+1 -1
templates/user/dashboard/milestones.tmpl
··· 51 51 <input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}},{{end}}]"> 52 52 <input type="hidden" name="sort" value="{{$.SortType}}"> 53 53 <input type="hidden" name="state" value="{{$.State}}"> 54 - {{template "shared/searchinput" dict "locale" .locale "Value" $.Keyword}} 54 + {{template "shared/searchinput" dict "Value" $.Keyword}} 55 55 <button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button> 56 56 </div> 57 57 </form>
+1 -1
templates/user/settings/applications.tmpl
··· 109 109 <div class="content"> 110 110 <p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p> 111 111 </div> 112 - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}} 112 + {{template "base/modal_actions_confirm" (dict "ModalButtonColors" "yellow")}} 113 113 </div> 114 114 115 115 {{template "user/settings/layout_footer" .}}