Skip to content

Resolve duplicate local string key related to PR comments #32073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

kemzeb
Copy link
Member

@kemzeb kemzeb commented Sep 18, 2024

A regression in #31924 caused there to be two issues.review.comment keys in the English language locale file, leading to a problem when reading PR review histories that contain comments.

This snapshot addresses this by making the newer key unique.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 18, 2024
@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code labels Sep 18, 2024
@kemzeb
Copy link
Member Author

kemzeb commented Sep 18, 2024

Before:
Screenshot 2024-09-18 114528

After:
Screenshot 2024-09-18 114431

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 18, 2024
@@ -247,7 +247,7 @@ func (r *Review) TooltipContent() string {
}
return "repo.issues.review.official"
case ReviewTypeComment:
return "repo.issues.review.comment"
return "repo.issues.review.commented"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't want to change the older repo.issues.review.comment as it has been there for a long time and it will affect users with custom templates. Open to other ways of handling this.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 18, 2024
@techknowlogick techknowlogick enabled auto-merge (squash) September 18, 2024 19:14
@techknowlogick techknowlogick added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Sep 18, 2024
@techknowlogick techknowlogick merged commit adea500 into go-gitea:main Sep 18, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Sep 18, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 18, 2024
@kemzeb kemzeb deleted the template-fix-locale-naming-conflict branch September 18, 2024 20:25
@yp05327 yp05327 modified the milestones: 1.24.0, 1.23.0 Sep 19, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 19, 2024
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix: database not update release when using `git push --tags --force` (go-gitea#32040)
  Resolve duplicate local string key related to PR comments (go-gitea#32073)
  Refactor CSRF protector (go-gitea#32057)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/translation skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants