mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-11-04 00:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace interface{} with any (#25686) (#25687)

Browse source 
Same perl replacement as https://github.com/go-gitea/gitea/pull/25686
but for 1.20 to ease future backporting.
This commit is contained in:
silverwind 2023-07-05 05:41:32 +02:00 • committed by GitHub
commit 24e64fe372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 729 additions and 729 deletions
Download patch file Download diff file Expand all files Collapse all files

10
services/mailer/mail.go
View file

@ -67,7 +67,7 @@ func SendTestMail(email string) error {
// sendUserMail sends a mail to the user
func sendUserMail(language string, u *user_model.User, tpl base.TplName, code, subject, info string) {
locale := translation.NewLocale(language)
data := map[string]interface{}{
data := map[string]any{
"DisplayName": u.DisplayName(),
"ActiveCodeLives": timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, locale),
"ResetPwdCodeLives": timeutil.MinutesToFriendly(setting.Service.ResetPwdCodeLives, locale),
@ -118,7 +118,7 @@ func SendActivateEmailMail(u *user_model.User, email *user_model.EmailAddress) {
return
}
locale := translation.NewLocale(u.Language)
data := map[string]interface{}{
data := map[string]any{
"DisplayName": u.DisplayName(),
"ActiveCodeLives": timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, locale),
"Code": u.GenerateEmailActivateCode(email.Email),
@ -151,7 +151,7 @@ func SendRegisterNotifyMail(u *user_model.User) {
}
locale := translation.NewLocale(u.Language)
data := map[string]interface{}{
data := map[string]any{
"DisplayName": u.DisplayName(),
"Username": u.Name,
"Language": locale.Language(),
@ -184,7 +184,7 @@ func SendCollaboratorMail(u, doer *user_model.User, repo *repo_model.Repository)
repoName := repo.FullName()
subject := locale.Tr("mail.repo.collaborator.added.subject", doer.DisplayName(), repoName)
data := map[string]interface{}{
data := map[string]any{
"Subject": subject,
"RepoName": repoName,
"Link": repo.HTMLURL(),
@ -258,7 +258,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
}
locale := translation.NewLocale(lang)
mailMeta := map[string]interface{}{
mailMeta := map[string]any{
"FallbackSubject": fallback,
"Body": body,
"Link": link,