Skip to content

cleanup repo details icons/labels (#27644) #27654

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
Merged
merged 2 commits into from
Oct 19, 2023
Merged

cleanup repo details icons/labels (#27644) #27654

merged 2 commits into from
Oct 19, 2023

Conversation

GiteaBot
Copy link
Collaborator

Backport #27644 by @denyskon

Fix #27596

Change confusing behavior when showing information about a repo via labels and icons. Implement changes proposed by @lng2020 in #27627 (review).

@denyskon @GiteaBot
cleanup repo details icons/labels (go-gitea#27644)
c3723ea 
Fix go-gitea#27596 

Change confusing behavior when showing information about a repo via
labels and icons. Implement changes proposed by @lng2020 in
go-gitea#27627 (review).
@GiteaBot GiteaBot added modifies/templates This PR modifies the template files modifies/translation type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Oct 16, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 16, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Oct 16, 2023
@GiteaBot GiteaBot requested review from 6543 and delvh October 16, 2023 21:06
6543
6543 reviewed Oct 16, 2023
View reviewed changes
options/locale/locale_en-US.ini
@@ -1026,10 +1026,8 @@ transfer.no_permission_to_reject = You do not have permission to reject this tra

desc.private = Private
desc.public = Public
desc.private_template = Private template
desc.public_template = Template
desc.template = Template
Copy link
Member

Choose a reason for hiding this comment

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

this will mess with backportin translations :/

Copy link
Member

Choose a reason for hiding this comment

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

That's exactly the reason I'm backporting this PR - so that we can safely backport translations without breaking anything

Copy link
Member

Choose a reason for hiding this comment

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

Otherwise backporting translations will result in nonexistent translation strings inside the template

Copy link
Member

Choose a reason for hiding this comment

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

well if you will manually packport the upcomming translation ... I wont block

Copy link
Member

Choose a reason for hiding this comment

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

Alternatively, we could also move desc.template to desc.public_template inside this PR, then the translation will be present in 1.21, and we can still merge this PR.

@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 Oct 16, 2023
6543
6543 requested changes Oct 16, 2023
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

as per code comment

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 16, 2023
delvh
delvh approved these changes Oct 19, 2023
View reviewed changes
options/locale/locale_en-US.ini
@@ -1026,10 +1026,8 @@ transfer.no_permission_to_reject = You do not have permission to reject this tra

desc.private = Private
desc.public = Public
desc.private_template = Private template
desc.public_template = Template
desc.template = Template
Copy link
Member

Choose a reason for hiding this comment

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

Alternatively, we could also move desc.template to desc.public_template inside this PR, then the translation will be present in 1.21, and we can still merge this PR.

@denyskon
Copy link
Member

I don't really understand the issue.... currently we have public_template in 1.21.
When we backport translations, it'll be replaced with template - but the code still refers to public_template. So shouldn't this backport solve the problem, not cause it? Or do I think incorrectly?

@delvh
Copy link
Member

delvh commented Oct 19, 2023 •
edited
Loading

The problem is that translations are only synced through Crowdin, and only for the main branch, so backported translations will only be available in their English fallback as the new translations won't be available for release/v1.21.

@denyskon
Copy link
Member

Don't we always manually backport translations before the release? At least we did it for 1.20 and 1.19 if I remember correctly

@delvh
Copy link
Member

delvh commented Oct 19, 2023

Yes, that's exactly what @6543 meant with #27654 (comment).
It simply isn't an automatic process, so if someone does it manually, it's fine.

@denyskon denyskon requested a review from 6543 October 19, 2023 14:16
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged labels Oct 19, 2023
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 19, 2023
@delvh delvh merged commit 6cef7a7 into go-gitea:release/v1.21 Oct 19, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 19, 2023
@lunny
Copy link
Member

lunny commented Oct 20, 2023

The problem is that translations are only synced through Crowdin, and only for the main branch, so backported translations will only be available in their English fallback as the new translations won't be available for release/v1.21.

We now can backport translations and we have done that many times. There is a tool build/backport-locales.go to help us do that.

@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@denyskon denyskon denyskon approved these changes

@6543 6543 6543 approved these changes

@delvh delvh delvh approved these changes

Assignees

@denyskon denyskon

Labels
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 type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
5 participants
@GiteaBot @denyskon @delvh @lunny @6543