-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Use index of the supported tags to choose user lang (#15452) #15488
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Backport go-gitea#15452 Fix go-gitea#14793. The previous implementation used the first return value of matcher.Match, which is the chosen language tag but may contain extensions such as de-DE-u-rg-chzzzz. As mentioned in the documentation of language package, matcher.Match also returns the index of the supported tags, so I think it is better to use it rather than manipulate the returned language tag.
6543
approved these changes
Apr 15, 2021
GiteaBot
added
the
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
label
Apr 15, 2021
silverwind
approved these changes
Apr 15, 2021
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
Apr 15, 2021
🚀 |
aswild
added a commit
to aswild/gitea
that referenced
this pull request
May 3, 2021
v1.14.1 * BUGFIXES * Fix bug clone wiki (go-gitea#15499) (go-gitea#15502) * Github Migration ignore rate limit, if not enabled (go-gitea#15490) (go-gitea#15495) * Use subdir for URL (go-gitea#15446) (go-gitea#15493) * Query the DB for the hash before inserting in to email_hash (go-gitea#15457) (go-gitea#15491) * Ensure review dismissal only dismisses the correct review (go-gitea#15477) (go-gitea#15489) * Use index of the supported tags to choose user lang (go-gitea#15452) (go-gitea#15488) * Fix wrong file link in code search page (go-gitea#15466) (go-gitea#15486) * Quick template fix for built-in SSH server in admin config (go-gitea#15464) (go-gitea#15481) * Prevent superfluous response.WriteHeader (go-gitea#15456) (go-gitea#15476) * Fix ambiguous argument error on tags (go-gitea#15432) (go-gitea#15474) * Add created_unix instead of expiry to migration (go-gitea#15458) (go-gitea#15463) * Fix repository search (go-gitea#15428) (go-gitea#15442) * Prevent NPE on avatar direct rendering if federated avatars disabled (go-gitea#15434) (go-gitea#15439) * Fix wiki clone urls (go-gitea#15430) (go-gitea#15431) * Fix dingtalk icon url at webhook (go-gitea#15417) (go-gitea#15426) * Standardise icon on projects PR page (go-gitea#15387) (go-gitea#15408) * ENHANCEMENTS * Add option to skip LFS/attachment files for `dump` (go-gitea#15407) (go-gitea#15492) * Clone panel fixes (go-gitea#15436) * Use semantic dropdown for code search query type (go-gitea#15276) (go-gitea#15364) * BUILD * Build go-git variants for windows (go-gitea#15482) (go-gitea#15487) * Lock down build-images dependencies (Partial go-gitea#15479) (go-gitea#15480) * MISC * Performance improvement for list pull requests (go-gitea#15447) (go-gitea#15500) * Fix potential copy lfs records failure when fork a repository (go-gitea#15441) (go-gitea#15485)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #15452
Fix #14793.
The previous implementation used the first return value of matcher.Match, which is the chosen language tag but may contain extensions such as de-DE-u-rg-chzzzz.
As mentioned in the documentation of language package, matcher.Match also returns the index of the supported tags, so I think it is better to use it rather than manipulate the returned language tag.
Co-authored-by: Naohisa Murakami tiqwab.ch90@gmail.com