Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(#32667): 🐛 Fixe a keystring misuse and refactor duplicates keystrings #32668

Merged
merged 4 commits into from
Dec 1, 2024
Merged

fix(#32667): 🐛 Fixe a keystring misuse and refactor duplicates keystrings #32668

merged 4 commits into from
Dec 1, 2024

Conversation

SimonPistache
Copy link
Contributor

@SimonPistache SimonPistache commented Nov 28, 2024 •
edited
Loading

@SimonPistache
fix(go-gitea#32667): 🐛 Fixe a keystring misuse and refactor duplicate…
b7f2128 
…s keystrings

- Fixe a translation keystring misuse where the string 'open milestones' is used in place of 'closed milestones'.
- De-duplicates the use of 'open milesones' and 'closed milestones' keystrings on the sidebar of an issue, reusing the ones on the issues filter and action bars.
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 28, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 28, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Nov 28, 2024
@wxiaoguang
Copy link
Contributor

  • De-duplicates the use of 'open milesones' and 'closed milestones' keystrings on the sidebar of an issue, reusing the ones on the issues filter and action bars.

Could the unused keys like "issues.new.closed_milestone" and "issues.new.open_milestone" be deleted from locale_en-US.ini ? (only en-US is enough, other files will be managed automatically)

@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 Nov 29, 2024
@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 Nov 29, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 29, 2024
@wxiaoguang wxiaoguang removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 29, 2024
@wxiaoguang
Copy link
Contributor

Could the unused keys like "issues.new.closed_milestone" and "issues.new.open_milestone" be deleted from locale_en-US.ini ? (only en-US is enough, other files will be managed automatically)

Wait for this for a while, in case there would be new changes.

@wxiaoguang
Copy link
Contributor

  • De-duplicates the use of 'open milesones' and 'closed milestones' keystrings on the sidebar of an issue, reusing the ones on the issues filter and action bars.

Could the unused keys like "issues.new.closed_milestone" and "issues.new.open_milestone" be deleted from locale_en-US.ini ? (only en-US is enough, other files will be managed automatically)

@SimonPistache could you confirm whether these keys are unused and could be removed?

@SimonPistache
Copy link
Contributor Author

SimonPistache commented Nov 30, 2024 •
edited
Loading

  • De-duplicates the use of 'open milesones' and 'closed milestones' keystrings on the sidebar of an issue, reusing the ones on the issues filter and action bars.

Could the unused keys like "issues.new.closed_milestone" and "issues.new.open_milestone" be deleted from locale_en-US.ini ? (only en-US is enough, other files will be managed automatically)

@SimonPistache could you confirm whether these keys are unused and could be removed?

→ github search for issues.new.closed_milestone
→ github search for issues.new.open_milestone

@wxiaoguang it looks like the keystring are used on the debian packaging repo, thus we should not remove until they get properly replaced.

I don't know this repo nor how safe it is to change its content, but by scanning at the files names, it looks like they have the same job (templates/repo/issue/view_content/sidebar.tmpl and templates/repo/issue/new_form.tmpl) as the ones in the main repo.

@wxiaoguang
Copy link
Contributor

wxiaoguang commented Dec 1, 2024 •
edited
Loading

it looks like the keystring are used on the debian packaging repo, thus we should not remove until they get properly replaced.

Nope, they are not used there. I will remove these keys.

@SimonPistache
Copy link
Contributor Author

it looks like the keystring are used on the debian packaging repo, thus we should not remove until they get properly replaced.

Nope, there are not used there. I will remove these keys.

@wxiaoguang
Copy link
Contributor

debian packaging

That "debian packaging" is a dead repo and it has its own "translations". The strings in this repo are unrelated.

@wxiaoguang wxiaoguang merged commit 2abef97 into go-gitea:main Dec 1, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Dec 1, 2024
@wxiaoguang wxiaoguang added the backport/v1.22 This PR should be backported to Gitea 1.22 label Dec 1, 2024
@wxiaoguang wxiaoguang modified the milestones: 1.24.0, 1.23.0 Dec 1, 2024
@GiteaBot
Copy link
Collaborator

GiteaBot commented Dec 1, 2024

I was unable to create a backport for 1.22. @SimonPistache, please send one manually. 🍵

go run ./contrib/backport 32668
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Dec 1, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 2, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
5ebe735 
* giteaofficial/main:
  Refactor RepoBranchTagSelector (go-gitea#32681)
  Allow to disable the password-based login (sign-in) form (go-gitea#32687)
  Fix JS error when reply comment on Conversation page (go-gitea#32685)
  fix(go-gitea#32667): 🐛 Fixe a keystring misuse and refactor duplicates keystrings (go-gitea#32668)
lunny pushed a commit to lunny/gitea that referenced this pull request Dec 11, 2024
@SimonPistache @wxiaoguang @lunny
fix(go-gitea#32667): 🐛 Fixe a keystring misuse and refactor duplicate…
d92c96a 
…s keystrings (go-gitea#32668)

- Fixes a translation keystring misuse where the string 'open
milestones' is used in place of 'closed milestones'.
- De-duplicates the use of 'open milesones' and 'closed milestones'
keystrings on the sidebar of an issue, reusing the ones on the issues
filter and action bars.
- Closes go-gitea#32667

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@lunny lunny mentioned this pull request Dec 11, 2024
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Dec 11, 2024
techknowlogick pushed a commit that referenced this pull request Dec 11, 2024
@lunny @SimonPistache @wxiaoguang
🐛 Fixe a keystring misuse and refactor duplicates keystrings (#32668) (…
6092bba 
…#32792)

Backport #32668 

- Fixes a translation keystring misuse where the string 'open
milestones' is used in place of 'closed milestones'.
- De-duplicates the use of 'open milesones' and 'closed milestones'
keystrings on the sidebar of an issue, reusing the ones on the issues
filter and action bars.
- Closes #32667

Co-authored-by: Simon Pistache <105607989+SimonPistache@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zettat123 Zettat123 Zettat123 approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files modifies/translation size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Reuse the same translation keystrings for the same labels in milestone dropdown menus
5 participants
@SimonPistache @wxiaoguang @GiteaBot @Zettat123 @lunny