Skip to content

Commit e85b63b

Browse files
committed
fix issue with a text not being translatable
1 parent a2d0191 commit e85b63b

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

options/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ issues.unlock = Unlock conversation
784784
issues.lock.unknown_reason = Cannot lock an issue with an unknown reason.
785785
issues.lock_duplicate = An issue cannot be locked twice.
786786
issues.unlock_error = Cannot unlock an issue that is not locked.
787-
issues.lock_comment = "locked %s <strong>%s</strong> and limited conversation to collaborators %s"
787+
issues.lock_with_reason = "locked as <strong>%s</strong> and limited conversation to collaborators %s"
788788
issues.unlock_comment = "unlocked this conversation %s"
789789
issues.lock_confirm = Lock
790790
issues.unlock_confirm = Unlock

templates/repo/issue/view_content/comments.tmpl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING,
77
13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
88
18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
9-
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_LOCKED -->
9+
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED -->
1010
{{if eq .Type 0}}
1111
<div class="comment" id="{{.HashTag}}">
1212
<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
@@ -367,13 +367,8 @@
367367
<img src="{{.Poster.RelAvatarLink}}">
368368
</a>
369369

370-
{{ $formatting := "" }}
371-
{{ if .Content }}
372-
{{ $formatting = "as " }}
373-
{{ end }}
374-
375370
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
376-
{{$.i18n.Tr "repo.issues.lock_comment" $formatting .Content $createdStr | Safe}}
371+
{{$.i18n.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}}
377372
</span>
378373
</div>
379374
{{else if eq .Type 24}}

0 commit comments

Comments
 (0)