imrpove

Author: yp05327

models/issues/comment.go

@@ -186,7 +186,7 @@ type Role string
 
 // RoleDescriptor defines comment tag type
 type RoleDescriptor struct {
-	IsPoster util.OptionalBool
+	IsPoster bool
 	Role     Role
 }
 
@@ -210,12 +210,12 @@ func (r Role) String() string {
 
 // LocaleString returns the locale string name of the Status
 func (r Role) LocaleString(lang translation.Locale) string {
-	return lang.Tr("repo.issues." + r.String())
+	return lang.Tr("repo.issues.role." + r.String())
 }
 
 // LocaleHelper returns the locale string name of the Status
 func (r Role) LocaleHelper(lang translation.Locale) string {
-	return lang.Tr("repo.issues." + r.String() + "_helper")
+	return lang.Tr("repo.issues.role." + r.String() + "_helper")
 }
 
 // Comment represents a comment in commit and issue page.

options/locale/locale_en-US.ini

@@ -1482,16 +1482,16 @@ issues.ref_reopened_from = `<a href="%[3]s">reopened this issue %[4]s</a> <a id=
 issues.ref_from = `from %[1]s`
 issues.author = Author
 issues.author_helper = This user is the author.
-issues.owner = Owner
-issues.owner_helper = This user is the owner of this repository.
-issues.member = Member
-issues.member_helper = This user is a member of the organization owning this repository.
-issues.collaborator = Collaborator
-issues.collaborator_helper = This user has been invited to collaborate on the repository.
-issues.first_time_contributor = First-time contributor
-issues.first_time_contributor_helper = This is the first contribution of this user to the repository.
-issues.contributor = Contributor
-issues.contributor_helper = This user has previously committed to the repository.
+issues.role.owner = Owner
+issues.role.owner_helper = This user is the owner of this repository.
+issues.role.member = Member
+issues.role.member_helper = This user is a member of the organization owning this repository.
+issues.role.collaborator = Collaborator
+issues.role.collaborator_helper = This user has been invited to collaborate on the repository.
+issues.role.first_time_contributor = First-time contributor
+issues.role.first_time_contributor_helper = This is the first contribution of this user to the repository.
+issues.role.contributor = Contributor
+issues.role.contributor_helper = This user has previously committed to the repository.
 issues.re_request_review=Re-request review
 issues.is_stale = There have been changes to this PR since this review
 issues.remove_request_review=Remove review request

routers/web/repo/issue.go

@@ -1243,7 +1243,7 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 
 	// If the poster is the actual poster of the issue, enable Poster role.
 	if issue.IsPoster(poster.ID) {
-		roleDescriptor.IsPoster = util.OptionalBoolTrue
+		roleDescriptor.IsPoster = true
 	}
 
 	// Check if the poster is owner of the repo.

templates/repo/issue/view_content/show_role.tmpl

@@ -1,4 +1,4 @@
-{{if and .ShowRole.IsPoster.IsTrue (not .IgnorePoster)}}
+{{if and .ShowRole.IsPoster (not .IgnorePoster)}}
 	<div class="ui basic label role-label" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.author_helper"}}">
 		{{ctx.Locale.Tr "repo.issues.author"}}
 	</div>