mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Add reply hint to mail text (#22459)
Addition to #22056 This PR adds a hint to mail text if replies are supported. I can't tell if the text structure is supported in every language. Maybe we need to put the whole line in the translation file and use parameters.
This commit is contained in:
		@@ -365,6 +365,7 @@ password_pwned_err = Could not complete request to HaveIBeenPwned
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
[mail]
 | 
					[mail]
 | 
				
			||||||
view_it_on = View it on %s
 | 
					view_it_on = View it on %s
 | 
				
			||||||
 | 
					reply = or reply to this email directly
 | 
				
			||||||
link_not_working_do_paste = Not working? Try copying and pasting it to your browser.
 | 
					link_not_working_do_paste = Not working? Try copying and pasting it to your browser.
 | 
				
			||||||
hi_user_x = Hi <b>%s</b>,
 | 
					hi_user_x = Hi <b>%s</b>,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -274,6 +274,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
 | 
				
			|||||||
		"ActionName":      actName,
 | 
							"ActionName":      actName,
 | 
				
			||||||
		"ReviewComments":  reviewComments,
 | 
							"ReviewComments":  reviewComments,
 | 
				
			||||||
		"Language":        locale.Language(),
 | 
							"Language":        locale.Language(),
 | 
				
			||||||
 | 
							"CanReply":        setting.IncomingEmail.Enabled && commentType != issues_model.CommentTypePullRequestPush,
 | 
				
			||||||
		// helper
 | 
							// helper
 | 
				
			||||||
		"locale":    locale,
 | 
							"locale":    locale,
 | 
				
			||||||
		"Str2html":  templates.Str2html,
 | 
							"Str2html":  templates.Str2html,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -84,7 +84,7 @@
 | 
				
			|||||||
	<p>
 | 
						<p>
 | 
				
			||||||
		---
 | 
							---
 | 
				
			||||||
		<br>
 | 
							<br>
 | 
				
			||||||
		<a href="{{.Link}}">{{.locale.Tr "mail.view_it_on" AppName}}</a>.
 | 
							<a href="{{.Link}}">{{.locale.Tr "mail.view_it_on" AppName}}</a>{{if .CanReply}} {{.locale.Tr "mail.reply"}}{{end}}.
 | 
				
			||||||
	</p>
 | 
						</p>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
</body>
 | 
					</body>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user