lest html in locale++

6543 · 6543 · commit 71748d2e5641 · 2021-06-23T03:34:07.000+02:00
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -355,20 +355,20 @@ issue.action.new = Created #%[2]d.
 issue.in_tree_path = In %s:
 
 release.new.subject = %s in %s released
-release.new.body = <b>@%[1]s</b> released <a href="%[2]s">%[3]s</a> in <a href="%[4]s">%[5]s</a>
+release.new.text = <b>@%[1]s</b> released %[2]s in %[3]s
 release.title = Title: %s
 release.note = Note:
 release.downloads = Downloads:
-release.download.zip = <a href="%s" rel="nofollow"><strong> Source Code (ZIP)</strong></a>
-release.download.targz = <a href="%s"><strong> Source Code (TAR.GZ)</strong></a>
+release.download.zip = Source Code (ZIP)
+release.download.targz = Source Code (TAR.GZ)
 
 repo.transfer.subject_to = %s would like to transfer "%s" to %s
 repo.transfer.subject_to_you = %s would like to transfer "%s" to you
 repo.transfer.to_you = you
-repo.transfer.body = To accept or reject it visit <a href="%[1]s">%[2]s</a> or just ignore it.
+repo.transfer.body = To accept or reject it visit %s or just ignore it.
 
 repo.collaborator.added.subject = %s added you to %s
-repo.collaborator.added.body = <p>You have been added as a collaborator of repository: <code>%[1]s</code></p>
+repo.collaborator.added.text = You have been added as a collaborator of repository:
 
 [modal]
 yes = Yes
diff --git a/templates/mail/notify/collaborator.tmpl b/templates/mail/notify/collaborator.tmpl
@@ -9,7 +9,7 @@
 </head>
 
 <body>
-	{{.i18n.Tr "mail.repo.collaborator.added.body" .RepoName | Str2html}}
+	<p>{{.i18n.Tr "mail.repo.collaborator.added.text"}} <code>{{.RepoName}}</code></p>
 	<div class="footer">
 		<p>
 			---
diff --git a/templates/mail/notify/repo_transfer.tmpl b/templates/mail/notify/repo_transfer.tmpl
@@ -5,9 +5,10 @@
 	<title>{{.Subject}}</title>
 </head>
 
+{{$url := printf "<a href='%[1]s'>%[2]s</a>" .Link .Repo}}
 <body>
 	<p>{{.Subject}}.
-		{{.i18n.Tr "mail.repo.transfer.body" .Link .Repo | Str2html}}
+		{{.i18n.Tr "mail.repo.transfer.body" $url | Str2html}}
 	<p>
 		---
 		<br>
diff --git a/templates/mail/release.tmpl b/templates/mail/release.tmpl
@@ -11,9 +11,11 @@
 
 </head>
 
+{{$release_url := printf "<a href='%s'>%s</a>" .Release.HTMLURL .Release.TagName}}
+{{$repo_url := printf "<a href='%s'>%s</a>" .Release.Repo.HTMLURL .Release.Repo.FullName}}
 <body>
 	<p>
-		{{.i18n.Tr "mail.release.new.body" .Release.Publisher.Name .Release.HTMLURL .Release.TagName .Release.Repo.HTMLURL .Release.Repo.FullName | Str2html}}
+		{{.i18n.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url | Str2html}}
 	</p>
 	<h4>{{.i18n.Tr "mail.release.title" .Release.Title}}</h4>
 	<p>
@@ -30,13 +32,12 @@
 		{{.i18n.Tr "mail.release.downloads"}}
 		<ul>
 			{{$tagname := .Release.TagName | EscapePound}}
+			{{$archive_url := printf "%s%s/%s/archive" AppUrl .Release.Repo.OwnerName .Release.Repo.Name}}
 			<li>
-				{{$zip_url := printf "%s%s/%s/archive/%s.zip" AppUrl .Release.Repo.OwnerName .Release.Repo.Name $tagname}}
-				{{.i18n.Tr "mail.release.download.zip" $zip_url | Str2html}}
+				<a href="{{$archive_url}}/{{$tagname}}.zip" rel="nofollow"><strong>{{.i18n.Tr "mail.release.download.zip"}}</strong></a>
 			</li>
 			<li>
-				{{$targz_url := printf "%s%s/%s/archive/%s.tar.gz" AppUrl .Release.Repo.OwnerName .Release.Repo.Name $tagname}}
-				{{.i18n.Tr "mail.release.download.targz" $targz_url | Str2html}}
+				<a href="{{$archive_url}}/{{$tagname}}.tar.gz" rel="nofollow"><strong>{{.i18n.Tr "mail.release.download.targz"}}</strong></a>
 			</li>
 			{{if .Release.Attachments}}
 				{{range .Release.Attachments}}
