finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add reply hint to mail text (#22459)

Browse source 
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:
KN4CK3R 2023-01-16 21:58:01 +01:00 committed by GitHub
parent 2cc3a6381c
commit 8117e41dfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View file

@ -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>,

1
services/mailer/mail.go
View file

@ -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,

2
templates/mail/issue/default.tmpl
View file

@ -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>