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

Ensure that Chinese punctuation is not ambiguous when locale is Chinese #22019

Merged
merged 3 commits into from Dec 4, 2022

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Dec 3, 2022

Although there are per-locale fallbacks for ambiguity the locale names for Chinese do not quite match our locales. This PR simply maps zh-CN on to zh-hans and other zh variants on to zh-hant.

Ref #20999

Signed-off-by: Andrew Thornton art27@cantab.net

Although there are per-locale fallbacks for ambiguity the locale names for Chinese do not
quite match our locales. This PR simply maps zh-CN on to zh-hans and other zh variants on to
zh-hant.

Ref go-gitea#20999

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added type/bug outdated/backport/v1.18 This PR should be backported to Gitea 1.18 labels Dec 3, 2022
@zeripath zeripath added this to the 1.19.0 milestone Dec 3, 2022
Signed-off-by: Andrew Thornton <art27@cantab.net>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 4, 2022
@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 Dec 4, 2022
@zeripath zeripath merged commit a08584e into go-gitea:main Dec 4, 2022
@zeripath zeripath deleted the fix-hans-hant-ambiguous-fallback branch December 4, 2022 17:57
zeripath added a commit to zeripath/gitea that referenced this pull request Dec 4, 2022
…se (go-gitea#22019)

Backport go-gitea#22019

Although there are per-locale fallbacks for ambiguity the locale names
for Chinese do not quite match our locales. This PR simply maps zh-CN on
to zh-hans and other zh variants on to zh-hant.

Ref go-gitea#20999

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added the backport/done All backports for this PR have been created label Dec 4, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 5, 2022
* giteaofficial/main:
  Ensure that Chinese punctuation is not ambiguous when locale is Chinese (go-gitea#22019)
  Use GhostUser if needed for TrackedTimes (go-gitea#22021)
  Add dumb-init to rootless docker (go-gitea#21775)
  On tag/branch-exist check, dont panic if repo is nil (go-gitea#21787)
  Fix ListBranches to handle empty case (go-gitea#21921)
  fix(web): reduce page jitter on browsers that support overlay scrollbar (go-gitea#21850)
  [skip ci] Updated licenses and gitignores
  Do not emit ambiguous character warning on rendered pages (go-gitea#22016)
lunny pushed a commit that referenced this pull request Dec 5, 2022
…se (#22019) (#22030)

Backport #22019

Although there are per-locale fallbacks for ambiguity the locale names
for Chinese do not quite match our locales. This PR simply maps zh-CN on
to zh-hans and other zh variants on to zh-hant.

Ref #20999

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
@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.
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. outdated/backport/v1.18 This PR should be backported to Gitea 1.18 type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants