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.

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

Use en-US as fallback when using other default language #21200

Merged
merged 3 commits into from
Sep 24, 2022
Merged

Use en-US as fallback when using other default language #21200

merged 3 commits into from
Sep 24, 2022

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Sep 18, 2022 •
edited
Loading

Only en-US has complete translations. When use other language as default, the en-US should still be used as fallback.

Close #21199

Screenshot

image

@wxiaoguang wxiaoguang added this to the 1.18.0 milestone Sep 18, 2022
@wxiaoguang wxiaoguang mentioned this pull request Sep 18, 2022
Closed
@wxiaoguang wxiaoguang added the type/enhancement An improvement of existing functionality label Sep 18, 2022
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 18, 2022
@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 Sep 20, 2022
@wxiaoguang
Copy link
Contributor Author

@go-gitea/maintainers need one more review

@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 24, 2022
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Sep 24, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #21200 (4c13ad8) into main (0c8ce71) will decrease coverage by 0.18%.
The diff coverage is 46.15%.

@@            Coverage Diff             @@
##             main   #21200      +/-   ##
==========================================
- Coverage   47.16%   46.97%   -0.19%     
==========================================
  Files        1017     1017              
  Lines      138119   138125       +6     
==========================================
- Hits        65147    64888     -259     
- Misses      65030    65332     +302     
+ Partials     7942     7905      -37
Impacted Files Coverage Δ
modules/translation/i18n/i18n.go 100.00% <ø> (ø)
modules/translation/translation.go 47.40% <36.36%> (-2.21%) ⬇️
modules/translation/i18n/localestore.go 83.14% <100.00%> (ø)
routers/web/repo/wiki.go 3.74% <0.00%> (-35.95%) ⬇️
models/asymkey/gpg_key_common.go 52.63% <0.00%> (-3.95%) ⬇️
modules/queue/queue_bytefifo.go 50.18% <0.00%> (-2.89%) ⬇️
modules/notification/mail/mail.go 39.04% <0.00%> (-2.74%) ⬇️
modules/git/blame.go 69.66% <0.00%> (-2.25%) ⬇️
modules/log/event.go 58.18% <0.00%> (-2.10%) ⬇️
modules/notification/ui/ui.go 58.92% <0.00%> (-1.79%) ⬇️
... and 6 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@lafriks lafriks merged commit bb1e0d0 into go-gitea:main Sep 24, 2022
@lafriks
Copy link
Member

lafriks commented Sep 24, 2022

please send backport

@wxiaoguang wxiaoguang deleted the fix-default-locale branch September 25, 2022 03:07
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Sep 25, 2022
@wxiaoguang
backport go-gitea#21200
d123259
@wxiaoguang wxiaoguang mentioned this pull request Sep 25, 2022
Merged
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Sep 25, 2022
lunny pushed a commit that referenced this pull request Sep 25, 2022
@wxiaoguang
Use en-US as fallback when using other default language (#21200) (#2…
e79a107 
…1256)

Only en-US has complete translations. When use other language as
default, the en-US should still be used as fallback.

Backport #21200, Close #21199
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 26, 2022
@zjjhot
Merge remote-tracking branch 'upstream/main'
3107305 
* upstream/main:
  [skip ci] Updated translations via Crowdin
  Typo in config-cheat-sheet (go-gitea#21261)
  Use native inputs in whitespace dropdown (go-gitea#20980)
  [skip ci] Updated licenses and gitignores
  Use en-US as fallback when using other default language (go-gitea#21200)
  Make NuGet service index publicly accessible (go-gitea#21242)
  Save files in local storage as umask (go-gitea#21198)
  NPM Package Registry search API endpoint (go-gitea#20280)
  [skip ci] Updated translations via Crowdin
  Added search input field to issue filter (go-gitea#20623)
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.18.0
Development

Successfully merging this pull request may close these issues.

Gitea fails to start because of non-translated string
5 participants
@wxiaoguang @codecov-commenter @lafriks @lunny @GiteaBot