diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-25 13:26:14 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-25 13:26:14 +0800 |
| commit | 219ca5cadbc9b56d47068becbc990298592bf4ee (patch) | |
| tree | 4bf41a189abf45661613ac281d8a0156e9036a85 /templates | |
| parent | 796be03e9b62154c9432622b8b4dbcef86a72a94 (diff) | |
| download | gitea-219ca5cadbc9b56d47068becbc990298592bf4ee.tar.gz gitea-219ca5cadbc9b56d47068becbc990298592bf4ee.zip | |
some fixes
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/editor/commit_form.tmpl | 3 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 43021ca59a..7b7e2cf463 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -14,7 +14,8 @@ <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" {{if eq .commit_choice "direct"}}checked{{end}}> <label> <i class="octicon octicon-git-commit" height="16" width="14"></i> - {{.i18n.Tr "repo.editor.commit_directly_to_this_branch" .BranchName | Safe}} + {{$branchName := .BranchName | Str2html}} + {{.i18n.Tr "repo.editor.commit_directly_to_this_branch" $branchName | Safe}} </label> </div> </div> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 3f3b62e653..4650ba4c80 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -28,7 +28,7 @@ {{if .Issue.PullRequest.HasMerged}} {{ $mergedStr:= TimeSince .Issue.PullRequest.Merged $.Lang }} <a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.Name}}</a> - <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Safe}}</span> + <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Str2html}}</span> {{else}} <a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.Name}}</a> <span class="pull-desc">{{$.i18n.Tr "repo.pulls.title_desc" .NumCommits .HeadTarget .BaseTarget | Str2html}}</span> |