diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 5cfd9ddef..04f76748d 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -88,7 +88,7 @@
{{ctx.Locale.Tr "packages.settings.delete"}}
- {{ctx.Locale.Tr "packages.settings.delete.notice" ` ` ` ` | Safe}}
+ {{ctx.Locale.Tr "packages.settings.delete.notice" (` `|Safe) (` `|Safe)}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index fdba0734a..c7a6ec7e4 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -101,7 +101,7 @@
{{ctx.Locale.Tr "repo.settings.delete_desc"}}
- {{ctx.Locale.Tr "repo.settings.delete_notices_2" `
` | Safe}}
+ {{ctx.Locale.Tr "repo.settings.delete_notices_2" (`
`|Safe)}}
{{ctx.Locale.Tr "repo.settings.delete_notices_fork_1"}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 894e41f8d..aa5e810cd 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -39,7 +39,7 @@
{{ctx.Locale.Tr "admin.monitor.process.cancel"}}
-
{{ctx.Locale.Tr "admin.monitor.process.cancel_notices" ` ` | Safe}}
+
{{ctx.Locale.Tr "admin.monitor.process.cancel_notices" (` `|Safe)}}
{{ctx.Locale.Tr "admin.monitor.process.cancel_desc"}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index e4ddb6980..03509ec93 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -73,7 +73,7 @@
{{ctx.Locale.Tr "org.members.leave"}}
-
{{ctx.Locale.Tr "org.members.leave.detail" ` ` | Safe}}
+
{{ctx.Locale.Tr "org.members.leave.detail" (` `|Safe)}}
{{template "base/modal_actions_confirm" .}}
@@ -82,7 +82,7 @@
{{ctx.Locale.Tr "org.members.remove"}}
-
{{ctx.Locale.Tr "org.members.remove.detail" ` ` ` ` | Safe}}
+
{{ctx.Locale.Tr "org.members.remove.detail" (` `|Safe) (` `|Safe)}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index da63d8296..dd4ece143 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -81,7 +81,7 @@
{{ctx.Locale.Tr "org.members.remove"}}
-
{{ctx.Locale.Tr "org.members.remove.detail" ` ` ` ` | Safe}}
+
{{ctx.Locale.Tr "org.members.remove.detail" (` `|Safe) (` `|Safe)}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index 29e7cf7cd..37550ab71 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -88,7 +88,7 @@
{{ctx.Locale.Tr "org.teams.leave"}}
-
{{ctx.Locale.Tr "org.teams.leave.detail" ` ` | Safe}}
+
{{ctx.Locale.Tr "org.teams.leave.detail" (` `|Safe)}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index f4ceada2a..b518d7d9d 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -49,7 +49,7 @@
{{ctx.Locale.Tr "org.teams.leave"}}
-
{{ctx.Locale.Tr "org.teams.leave.detail" ` ` | Safe}}
+
{{ctx.Locale.Tr "org.teams.leave.detail" (` `|Safe)}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 01fa45bab..ce9fcecd8 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -88,7 +88,7 @@
{{.CsrfTokenHtml}}
- {{ctx.Locale.Tr "repo.branch.new_branch_from" ` ` | Safe}}
+ {{ctx.Locale.Tr "repo.branch.new_branch_from" (` `|Safe)}}
@@ -113,7 +113,7 @@
- {{ctx.Locale.Tr "repo.tag.create_tag_from" ` ` | Safe}}
+ {{ctx.Locale.Tr "repo.tag.create_tag_from" (` `|Safe)}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index f71ee2f11..9e50ee4d9 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -112,9 +112,9 @@
{{template "shared/user/authorlink" .Poster}}
{{$link := printf "%s/commit/%s" $.Repository.Link ($.Issue.PullRequest.MergedCommitID|PathEscape)}}
{{if eq $.Issue.PullRequest.Status 3}}
- {{ctx.Locale.Tr "repo.issues.comment_manually_pull_merged_at" (printf `
%[2]s ` ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID)) (printf "
%[1]s " ($.BaseTarget|Escape)) $createdStr | Safe}}
+ {{ctx.Locale.Tr "repo.issues.comment_manually_pull_merged_at" (printf `
%[2]s ` ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) | Safe) (printf "
%[1]s " ($.BaseTarget|Escape) | Safe) $createdStr}}
{{else}}
- {{ctx.Locale.Tr "repo.issues.comment_pull_merged_at" (printf `
%[2]s ` ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID)) (printf "
%[1]s " ($.BaseTarget|Escape)) $createdStr | Safe}}
+ {{ctx.Locale.Tr "repo.issues.comment_pull_merged_at" (printf `
%[2]s ` ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) | Safe) (printf "
%[1]s " ($.BaseTarget|Escape) | Safe) $createdStr}}
{{end}}
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index f1ab53eb6..a28b849f9 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -38,7 +38,7 @@
{{ctx.Locale.Tr "repo.pulls.merged_success"}}
- {{ctx.Locale.Tr "repo.pulls.merged_info_text" (printf "%s
" (.HeadTarget | Escape)) | Str2html}}
+ {{ctx.Locale.Tr "repo.pulls.merged_info_text" (printf "%s
" (.HeadTarget | Escape) | Safe)}}
diff --git a/templates/repo/settings/webhook/settings.tmpl b/templates/repo/settings/webhook/settings.tmpl
index 3dfa094cf..8e2387067 100644
--- a/templates/repo/settings/webhook/settings.tmpl
+++ b/templates/repo/settings/webhook/settings.tmpl
@@ -263,7 +263,7 @@
{{ctx.Locale.Tr "repo.settings.authorization_header"}}
{{if ne .HookType "matrix"}}{{/* Matrix doesn't make the authorization optional but it is implied by the help string, should be changed.*/}}
- {{ctx.Locale.Tr "repo.settings.authorization_header_desc" "Bearer token123456
, Basic YWxhZGRpbjpvcGVuc2VzYW1l
" | Str2html}}
+ {{ctx.Locale.Tr "repo.settings.authorization_header_desc" ("Bearer token123456
, Basic YWxhZGRpbjpvcGVuc2VzYW1l
" | Safe)}}
{{end}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 807952198..102ff2e95 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -47,7 +47,7 @@
{{ctx.Locale.Tr "org.members.leave"}}
-
{{ctx.Locale.Tr "org.members.leave.detail" ` ` | Safe}}
+
{{ctx.Locale.Tr "org.members.leave.detail" (` `|Safe)}}
{{template "base/modal_actions_confirm" .}}