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.

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

Remove duplicate option in admin screen and now-unused translation keys #28492

Merged

Conversation

TheMagician23
Copy link
Contributor

Resolves #28451.

This change follows the recommendation by @wxiaoguang to remove the "Disable Minimum Key Size Check" from the "Service Configuration" section of the UI, because this option belongs to the "SSH Configuration" section of the administration menu and already has a functioning indicator in that section of the UI.

I've also removed all of the translation keys that were associated with the removed section as they are now entirely unused.

@GiteaBot
Copy link
Contributor

@TheMagician23 I noticed you've updated the locales for non-English languages. These will be overwritten during the sync from our translation tool Crowdin. If you'd like to contribute your translations, please visit https://crowdin.com/project/gitea. Please revert the changes done on these files. 🍵

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 16, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 16, 2023
@TheMagician23
Copy link
Contributor Author

Can someone please let me know if I need to revert removing the translations from the non-English files? I'm not 100% sure if the bot's recommendation holds since I'm removing unused keys instead of changing translations.

@delvh
Copy link
Member

delvh commented Dec 16, 2023

Yes, they will be autoremoved, the bot is correct.

@pull-request-size pull-request-size bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 16, 2023
@TheMagician23
Copy link
Contributor Author

@delvh Thanks. I've pushed a commit to only change the English file.

@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 Dec 16, 2023
@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 Dec 16, 2023
@wxiaoguang wxiaoguang enabled auto-merge (squash) December 17, 2023 04:00
@wxiaoguang wxiaoguang merged commit 7fb6b51 into go-gitea:main Dec 17, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Dec 17, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 19, 2023
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Add option to disable ambiguous unicode characters detection (go-gitea#28454)
  Adjust object format interface (go-gitea#28469)
  Remove duplicate option in admin screen and now-unused translation keys (go-gitea#28492)
  [skip ci] Updated translations via Crowdin
  Initalize stroage for orphaned repository doctor (go-gitea#28487)
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
…ys (go-gitea#28492)

Resolves go-gitea#28451.

This change follows the recommendation by wxiaoguang to remove the
"Disable Minimum Key Size Check" from the "Service Configuration"
section of the UI, because this option belongs to the "SSH
Configuration" section of the administration menu and already has a
functioning indicator in that section of the UI.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
…ys (go-gitea#28492)

Resolves go-gitea#28451.

This change follows the recommendation by wxiaoguang to remove the
"Disable Minimum Key Size Check" from the "Service Configuration"
section of the UI, because this option belongs to the "SSH
Configuration" section of the administration menu and already has a
functioning indicator in that section of the UI.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Mar 16, 2024
@lunny lunny added backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 labels Mar 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MINIMUM_KEY_SIZE_CHECK value wrongly evaluated
5 participants