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

Tweak locale to respect singular conflicting file message in PR list #10177

Merged
merged 2 commits into from
Feb 7, 2020

Conversation

jamesorlakin
Copy link
Contributor

A continuation of #10130 - If only one file is conflicting the corresponding message should now be "1 conflicting file", rather than "1 conflicting files".

As for why I didn't consider it first... 🤷‍♂

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 7, 2020
@techknowlogick techknowlogick added this to the 1.12.0 milestone Feb 7, 2020
@techknowlogick techknowlogick added the topic/ui Change the appearance of the Gitea UI label Feb 7, 2020
@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 Feb 7, 2020
@sapk sapk merged commit 6e6da2c into go-gitea:master Feb 7, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
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. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants