Use correct translation key for max repo limit error messages #18135

Gusted · 2021-12-30T14:17:28Z

Resolves Error message broken when migrating repo at max repo limit #18122

- Resolves go-gitea#18122

wxiaoguang · 2021-12-31T02:42:42Z

Could we refactor the function TrN and make them share the same code?

gitea/modules/templates/helper.go

Line 898 in a3d6850

func TrN(lang string, cnt interface{}, key1, keyN string) string {

IMO we should have a unified behavior in both template and backend code.

ps: the old TrN need to be refactored, too. The templates call it by {{.i18n.Tr (TrN .i18n.Lang ... ) }}, it is complex and might be simplified to {{.i18n.TrN ....}} directly.

codecov-commenter · 2021-12-31T08:25:45Z

Codecov Report

Merging #18135 (3bd0e29) into main (ffaebb1) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main   #18135      +/-   ##
==========================================
- Coverage   44.95%   44.94%   -0.01%     
==========================================
  Files         825      825              
  Lines       91559    91575      +16     
==========================================
- Hits        41159    41158       -1     
- Misses      43818    43837      +19     
+ Partials     6582     6580       -2

Impacted Files	Coverage Δ
routers/web/repo/migrate.go	`35.42% <0.00%> (-1.26%)`	⬇️
routers/web/repo/repo.go	`31.28% <0.00%> (-0.59%)`	⬇️
routers/web/repo/setting.go	`16.12% <0.00%> (-0.09%)`	⬇️
models/unit/unit.go	`41.09% <0.00%> (-2.74%)`	⬇️
modules/queue/workerpool.go	`50.00% <0.00%> (-2.30%)`	⬇️
modules/log/file.go	`73.60% <0.00%> (-1.61%)`	⬇️
models/repo_list.go	`76.62% <0.00%> (-0.60%)`	⬇️
modules/process/manager.go	`82.94% <0.00%> (+1.55%)`	⬆️
modules/queue/queue_channel.go	`96.66% <0.00%> (+1.66%)`	⬆️
modules/charset/charset.go	`75.75% <0.00%> (+4.04%)`	⬆️
... and 1 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 a3d6850...3bd0e29. Read the comment docs.

lunny · 2021-12-31T08:42:59Z

Could we refactor the function TrN and make them share the same code?

gitea/modules/templates/helper.go

Line 898 in a3d6850

func TrN(lang string, cnt interface{}, key1, keyN string) string {

IMO we should have a unified behavior in both template and backend code.

ps: the old TrN need to be refactored, too. The templates call it by {{.i18n.Tr (TrN .i18n.Lang ... ) }}, it is complex and might be simplified to {{.i18n.TrN ....}} directly.

That could be another PR.

lunny · 2021-12-31T08:43:26Z

Please send backport.

wxiaoguang · 2021-12-31T12:09:21Z

I proposed a refactoring for TrN:

Unify and simplify TrN for i18n #18141

* giteaoffical/main: tests: s/GITEA_UNIT_TESTS_VERBOSE/GITEA_UNIT_TESTS_LOG_SQL/ (go-gitea#18142) services/repository: fix ListUnadoptedRepositories incorrect total count (go-gitea#17865) Improve document for developers: Windows CGO, unit test option (go-gitea#18140) Reset the conflicted files list in testpatch (go-gitea#18139) Use correct translation key (go-gitea#18135)

- Backport of go-gitea#18135

…#18135 & #18153) (#18152) - Backport #18135 - Backport #18153

Refer: #18135 (comment) Now we have a unique and simple `TrN`, and make the fix of PR #18135 also use the better `TrN` logic.

[1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14 * BUGFIXES * Fix inconsistent PR comment counts (#18260) (#18261) * Fix release link broken (#18252) (#18253) * Fix update user from site administration page bug (#18250) (#18251) * Set HeadCommit when creating tags (#18116) (#18173) * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) * Fix purple color in suggested label colors (#18241) (#18242) * SECURITY * Bump mermaid from 8.10.1 to 8.13.8 (#18198) (#18206)

[1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14 * BUGFIXES * Fix inconsistent PR comment counts (go-gitea#18260) (go-gitea#18261) * Fix release link broken (go-gitea#18252) (go-gitea#18253) * Fix update user from site administration page bug (go-gitea#18250) (go-gitea#18251) * Set HeadCommit when creating tags (go-gitea#18116) (go-gitea#18173) * Use correct translation key for error messages due to max repo limits (go-gitea#18135 & go-gitea#18153) (go-gitea#18152) * Fix purple color in suggested label colors (go-gitea#18241) (go-gitea#18242) * SECURITY * Bump mermaid from 8.10.1 to 8.13.8 (go-gitea#18198) (go-gitea#18206)

* Changelog for 1.15.10 (#18274) [1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14 * BUGFIXES * Fix inconsistent PR comment counts (#18260) (#18261) * Fix release link broken (#18252) (#18253) * Fix update user from site administration page bug (#18250) (#18251) * Set HeadCommit when creating tags (#18116) (#18173) * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) * Fix purple color in suggested label colors (#18241) (#18242) * SECURITY * Bump mermaid from 8.10.1 to 8.13.8 (#18198) (#18206) * update docs/config.yaml Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Richard Mahn <richmahn@users.noreply.github.com>

- Resolves go-gitea#18122 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

Refer: go-gitea#18135 (comment) Now we have a unique and simple `TrN`, and make the fix of PR go-gitea#18135 also use the better `TrN` logic.

* Changelog for 1.15.10 (go-gitea#18274) [1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14 * BUGFIXES * Fix inconsistent PR comment counts (go-gitea#18260) (go-gitea#18261) * Fix release link broken (go-gitea#18252) (go-gitea#18253) * Fix update user from site administration page bug (go-gitea#18250) (go-gitea#18251) * Set HeadCommit when creating tags (go-gitea#18116) (go-gitea#18173) * Use correct translation key for error messages due to max repo limits (go-gitea#18135 & go-gitea#18153) (go-gitea#18152) * Fix purple color in suggested label colors (go-gitea#18241) (go-gitea#18242) * SECURITY * Bump mermaid from 8.10.1 to 8.13.8 (go-gitea#18198) (go-gitea#18206) * update docs/config.yaml Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Richard Mahn <richmahn@users.noreply.github.com>

Use correct translation key

831809d

- Resolves go-gitea#18122

delvh approved these changes Dec 30, 2021

View reviewed changes

GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 30, 2021

lunny approved these changes Dec 31, 2021

View reviewed changes

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 31, 2021

lunny added modifies/translation and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Dec 31, 2021

Merge branch 'main' into correct-tr

3bd0e29

GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Dec 31, 2021

lunny merged commit 7eb380b into go-gitea:main Dec 31, 2021

lunny added the backport/v1.15 label Dec 31, 2021

wxiaoguang mentioned this pull request Dec 31, 2021

Unify and simplify TrN for i18n #18141

Merged

Gusted deleted the correct-tr branch January 1, 2022 22:50

Gusted pushed a commit to Gusted/gitea that referenced this pull request Jan 1, 2022

backport: Use correct translation key

a40df12

- Backport of go-gitea#18135

Gusted mentioned this pull request Jan 1, 2022

Use correct translation key for error messages due to max repo limits (#18135 & #18153) #18152

Merged

zeripath added the backport/done All backports for this PR have been created label Jan 2, 2022

zeripath changed the title ~~Use correct translation key~~ Use correct translation key for max repo limit error messages Jan 2, 2022

zeripath pushed a commit that referenced this pull request Jan 2, 2022

Use correct translation key for error messages due to max repo limits (…

f9bbed0

…#18135 & #18153) (#18152) - Backport #18135 - Backport #18153

6543 pushed a commit that referenced this pull request Jan 2, 2022

Unify and simplify TrN for i18n (#18141)

e61b390

Refer: #18135 (comment) Now we have a unique and simple `TrN`, and make the fix of PR #18135 also use the better `TrN` logic.

richmahn mentioned this pull request Jan 14, 2022

Changelog for 1.15.10 #18274

Merged

zeripath mentioned this pull request Jan 14, 2022

Changelog for 1.15.10 (#18274) #18276

Merged

Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022

Use correct translation key (go-gitea#18135)

141a470

- Resolves go-gitea#18122 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022

Unify and simplify TrN for i18n (go-gitea#18141)

d31e309

Refer: go-gitea#18135 (comment) Now we have a unique and simple `TrN`, and make the fix of PR go-gitea#18135 also use the better `TrN` logic.

go-gitea locked and limited conversation to collaborators Apr 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Use correct translation key for max repo limit error messages #18135

Use correct translation key for max repo limit error messages #18135

Uh oh!

Gusted commented Dec 30, 2021 •

edited by zeripath

Loading

Uh oh!

wxiaoguang commented Dec 31, 2021 •

edited

Loading

Uh oh!

codecov-commenter commented Dec 31, 2021

Uh oh!

lunny commented Dec 31, 2021

Uh oh!

lunny commented Dec 31, 2021

Uh oh!

wxiaoguang commented Dec 31, 2021

Uh oh!

Uh oh!

Uh oh!

Use correct translation key for max repo limit error messages #18135

Use correct translation key for max repo limit error messages #18135

Uh oh!

Conversation

Gusted commented Dec 30, 2021 • edited by zeripath Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wxiaoguang commented Dec 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Dec 31, 2021

Codecov Report

Uh oh!

lunny commented Dec 31, 2021

Uh oh!

lunny commented Dec 31, 2021

Uh oh!

wxiaoguang commented Dec 31, 2021

Uh oh!

Uh oh!

Gusted commented Dec 30, 2021 •

edited by zeripath

Loading

wxiaoguang commented Dec 31, 2021 •

edited

Loading