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

Add TrN for repository limit #12492

Merged
merged 6 commits into from
Jan 21, 2021
Merged

Add TrN for repository limit #12492

merged 6 commits into from
Jan 21, 2021

Conversation

evur
Copy link
Contributor

@evur evur commented Aug 14, 2020

Adds a different message for users who have a limit of zero (technically <1) repositories.

@codecov-commenter
Copy link

codecov-commenter commented Aug 15, 2020

Codecov Report

Merging #12492 into master will decrease coverage by 0.07%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12492      +/-   ##
==========================================
- Coverage   43.07%   42.99%   -0.08%     
==========================================
  Files         658      658              
  Lines       72454    72453       -1     
==========================================
- Hits        31211    31154      -57     
- Misses      36186    36268      +82     
+ Partials     5057     5031      -26     
Impacted Files Coverage Δ
routers/repo/repo.go 29.58% <100.00%> (+0.85%) ⬆️
modules/indexer/stats/queue.go 64.70% <0.00%> (-11.77%) ⬇️
modules/indexer/stats/db.go 52.17% <0.00%> (-8.70%) ⬇️
modules/notification/ui/ui.go 72.22% <0.00%> (-8.34%) ⬇️
models/issue_comment.go 46.40% <0.00%> (-7.36%) ⬇️
modules/notification/mail/mail.go 28.73% <0.00%> (-5.75%) ⬇️
modules/git/commit.go 50.67% <0.00%> (-4.06%) ⬇️
modules/notification/base/null.go 68.57% <0.00%> (-2.86%) ⬇️
models/unit.go 46.57% <0.00%> (-2.74%) ⬇️
modules/notification/notification.go 78.57% <0.00%> (-2.68%) ⬇️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f215e01...a4d3a4b. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 15, 2020
@@ -697,6 +697,7 @@ archive.issue.nocomment = This repo is archived. You cannot comment on issues.
archive.pull.nocomment = This repo is archived. You cannot comment on pull requests.

form.reach_limit_of_creation = You have already reached your limit of %d repositories.
Copy link
Member

Choose a reason for hiding this comment

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

I think we need use TrN in here to handle singular and plural differences.

Copy link
Contributor Author

@evur evur Aug 15, 2020

Choose a reason for hiding this comment

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

What does "TrN" mean? I couldn't find anything.

Copy link
Member

Choose a reason for hiding this comment

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

example:

{{.i18n.Tr (TrN .i18n.Lang .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n") .Activity.ActivePRCount | Safe }}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. Looks like this solution is better, I will try to implement it.

@evur
Copy link
Contributor Author

evur commented Aug 22, 2020

I am sorry that I can't work on the pull request at the moment, but I will continue working on it when I have time.

@techknowlogick techknowlogick added this to the 1.14.0 milestone Sep 5, 2020
@techknowlogick techknowlogick added the pr/wip This PR is not ready for review label Sep 5, 2020
@evur evur closed this Sep 23, 2020
@evur
Copy link
Contributor Author

evur commented Sep 23, 2020

I wanted to work on the PR and first updated my fork... but GitHub automatically closed the PR. So please re-open it.
EDIT: I will commit and see if I can re-open it myself.

@evur evur reopened this Sep 23, 2020
@evur evur changed the title Different message for 0 repository limit Add TrN for repository limit Sep 23, 2020
@evur
Copy link
Contributor Author

evur commented Oct 6, 2020

Sorry, but I am not experienced enough with Go and the Gitea codebase. I thought I could make a little PR, but it turned out to be trickier.

@stale
Copy link

stale bot commented Dec 25, 2020

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

@stale stale bot added the issue/stale label Dec 25, 2020
@stale stale bot removed the issue/stale label Jan 21, 2021
@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 Jan 21, 2021
@6543 6543 added topic/ui Change the appearance of the Gitea UI and removed pr/wip This PR is not ready for review labels Jan 21, 2021
@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 Jan 21, 2021
@6543

This comment has been minimized.

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.

☝️

@6543 6543 added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Jan 21, 2021
@zeripath
Copy link
Contributor

@6543 it might be quicker to just do:

git fetch git@github.com:EV3R4/gitea.git master:pr-12492
git checkout pr-12492
# make your changes
# git commit
git push git@github.com:EV3R4/gitea.git pr-12492:master

@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 Jan 21, 2021
@6543
Copy link
Member

6543 commented Jan 21, 2021

🚀

@6543 6543 merged commit af70545 into go-gitea:master Jan 21, 2021
@go-gitea go-gitea locked and limited conversation to collaborators Mar 11, 2021
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.

8 participants