Skip to content

Commit a65f67a

Browse files
65436543
committed
mail.activate_account.test_123
1 parent 71748d2 commit a65f67a

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

‎options/locale/locale_en-US.ini

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ view_it_on = View it on %s
321321
322322
activate_account = Please activate your account
323323
activate_account.title = %s, please activate your account
324-
activate_account.body = <p>Hi <b>%[1]s</b>, thanks for registering at %[4]s!</p><br><p>Please click the following link to activate your account within <b>%[2]s</b>:</p><p><a href="%[3]s">%[3]s</a></p><br><p>Not working? Try copying and pasting it to your browser.</p>
324+
activate_account.test_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s!
325+
activate_account.test_2 = Please click the following link to activate your account within <b>%s</b>:
326+
activate_account.test_3 = Not working? Try copying and pasting it to your browser.
325327
326328
activate_email = Verify your email address
327329
activate_email.title = %s, please verify your e-mail address
@@ -337,11 +339,11 @@ reset_password.body = <p>Hi <b>%[1]s</b>,</p><br><p>Please click the following l
337339
338340
register_success = Registration successful
339341
340-
issue_assigned.pull = @%[1]s assigned you to the pull request <a href="@%[2]s">#@%[3]d</a> in repository %[4]s.
341-
issue_assigned.issue = @%[1]s assigned you to the issue <a href="@%[2]s">#@%[3]d</a> in repository %[4]s.
342+
issue_assigned.pull = @%[1]s assigned you to the pull request %[2]s in repository %[3]s.
343+
issue_assigned.issue = @%[1]s assigned you to the issue %[2]s in repository %[3]s.
342344
343345
issue.x_mentioned_you = <b>@%s</b> mentioned you:
344-
issue.action.force_push = <b>%[1]s</b> force-pushed the <b>%[2]s</b> from <a href="%[3]s"><b>%[4]s</b></a> to <a href="%[5]s"><b>%[6]s</b></a>.
346+
issue.action.force_push = <b>%[1]s</b> force-pushed the <b>%[2]s</b> from %[3]s to %[4]s.
345347
issue.action.push_1 = <b>@%[1]s</b> pushed 1 commit to %[2]s
346348
issue.action.push_n = <b>@%[1]s</b> pushed %[3]d commits to %s: %[2]s
347349
issue.action.close = Closed #%[2]d.

‎templates/mail/auth/activate.tmpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
{{ $activate_url := printf "%suser/activate?code=%s" AppUrl .Code}}
99
<body>
10-
{{.i18n.Tr "mail.activate_account.body" .DisplayName .ActiveCodeLives $activate_url AppName | Str2html}}
10+
<p>{{.i18n.Tr "mail.activate_account.test_1" .DisplayName AppName | Str2html}}</p><br>
11+
<p>{{.i18n.Tr "mail.activate_account.test_2" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>
12+
<p></p>{{.i18n.Tr "mail.activate_account.test_3" .DisplayName AppName | Str2html}}</p>
1113

1214
<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
1315
</body>

‎templates/mail/issue/assigned.tmpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
<title>{{.Subject}}</title>
99
</head>
1010

11+
{{$repo_url := printf "<a href='%s'>%s</a>" .Release.Repo.HTMLURL .Release.Repo.FullName}}
12+
{{$link := printf "<a href='%s'>#%d</a>" .Link .Issue.Index}}
1113
<body>
1214
<p>
1315
{{if .IsPull}}
14-
{{.i18n.Tr "mail.issue_assigned.pull" .Doer.Name .Link .Issue.Index .Repo | Str2html}}
16+
{{.i18n.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url | Str2html}}
1517
{{else}}
16-
{{.i18n.Tr "mail.issue_assigned.issue" .Doer.Name .Link .Issue.Index .Repo | Str2html}}
18+
{{.i18n.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url | Str2html}}
1719
{{end}}
1820
</p>
1921
<div class="footer">

‎templates/mail/issue/default.tmpl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@
2020
{{if eq .ActionName "push"}}
2121
<p>
2222
{{if .Comment.IsForcePush}}
23-
{{$oldCommitLink := printf "%s%s/%s/commit/%s" AppUrl .Comment.Issue.PullRequest.BaseRepo.OwnerName .Comment.Issue.PullRequest.BaseRepo.Name .Comment.OldCommit}}
23+
{{$oldCommitUrl := printf "%s%s/%s/commit/%s" AppUrl .Comment.Issue.PullRequest.BaseRepo.OwnerName .Comment.Issue.PullRequest.BaseRepo.Name .Comment.OldCommit}}
2424
{{$oldShortSha := ShortSha .Comment.OldCommit}}
25-
{{$newCommitLink := printf "%s%s/%s/commit/%s" AppUrl .Comment.Issue.PullRequest.BaseRepo.OwnerName .Comment.Issue.PullRequest.BaseRepo.Name .Comment.NewCommit}}
25+
{{$oldCommitLink := printf "<a href='%[1]s'><b>%[2]s</b></a>" $oldCommitUrl $oldShortSha}}
26+
27+
{{$newCommitUrl := printf "%s%s/%s/commit/%s" AppUrl .Comment.Issue.PullRequest.BaseRepo.OwnerName .Comment.Issue.PullRequest.BaseRepo.Name .Comment.NewCommit}}
2628
{{$newShortSha := ShortSha .Comment.NewCommit}}
27-
{{.i18n.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $oldShortSha $newCommitLink $newShortSha | Str2html}}
29+
{{$newCommitLink := printf "<a href='%[1]s'><b>%[2]s</b></a>" $newCommitUrl $newShortSha}}
30+
31+
{{.i18n.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink | Str2html}}
2832
{{else}}
2933
{{if eq .Comment.Commits.Len 1}}
3034
{{.i18n.Tr "mail.issue.action.push_1" .Doer.Name .Comment.Issue.PullRequest.HeadBranch | Str2html}}

0 commit comments

Comments
 (0)