Browse Source

#3408 minor code fix

Unknwon 8 years ago
parent
commit
d625e41c6c

+ 1 - 1
conf/locale/locale_en-US.ini

@@ -485,7 +485,7 @@ issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="
 issues.poster = Poster
 issues.collaborator = Collaborator
 issues.owner = Owner
-issues.sign_in_require_desc = Sign in to comment
+issues.sign_in_require_desc = <a href="%s">Sign in</a> to join this conversation.
 issues.edit = Edit
 issues.cancel = Cancel
 issues.save = Save

File diff suppressed because it is too large
+ 4 - 4
modules/bindata/bindata.go


+ 1 - 1
routers/repo/issue.go

@@ -637,7 +637,7 @@ func ViewIssue(ctx *context.Context) {
 	ctx.Data["NumParticipants"] = len(participants)
 	ctx.Data["Issue"] = issue
 	ctx.Data["IsIssueOwner"] = ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID))
-	ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login"
+	ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login?redirect_to=" + ctx.Data["Link"].(string)
 
 	ctx.Data["RequireHighlightJS"] = true
 

+ 1 - 1
templates/repo/issue/view_content.tmpl

@@ -227,7 +227,7 @@
 				</div>
 			{{else}}
 				<div class="ui warning message">
-					<a href="{{.SignInLink}}">{{.i18n.Tr "repo.issues.sign_in_require_desc" | Safe}}</a>
+					{{.i18n.Tr "repo.issues.sign_in_require_desc" .SignInLink | Safe}}
 				</div>
 			{{end}}
 		</ui>

Some files were not shown because too many files changed in this diff