Ensure that Chinese punctuation is not ambiguous when locale is Chinese

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 <[email protected]>
zeripath · Dec 3, 2022 · 2e508c5 · 2e508c5
1 parent 181f4bf
commit 2e508c5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/modules/charset/ambiguous.go b/modules/charset/ambiguous.go
@@ -28,6 +28,12 @@ func AmbiguousTablesForLocale(locale translation.Locale) []*AmbiguousTable {
 			key = key[:idx]
 		}
 	}
+	if table == nil && (locale.Language() == "zh-CN" || locale.Language() == "zh_CN")  {
+		table = AmbiguousCharacters["zh-hans"]
+	}
+	if table == nil && strings.HasPrefix(locale.Language(), "zh") {
+		table = AmbiguousCharacters["zh-hant"]
+	}
 	if table == nil {
 		table = AmbiguousCharacters["_default"]
 	}