Merge branch 'master' into dev

2025-10-26 15:52:32 +08:00
parent 7ac8c24d2a 38a46b85e1
commit 8aaf4fe712
12 changed files with 150 additions and 30 deletions
@@ -273,10 +273,9 @@ func GetDefaultLang() string {
 }

 func getLangFromCtx(ctx context.Context) string {
-	ctxVal := ctx.Value(l.ops.ctxLangKey)
-	lang := l.ops.defaultLang
-	if ctxVal != nil {
-		lang = ctxVal.(string)
+	lang := GetCtxLang(ctx)
+	if lang == "" {
+		lang = l.ops.defaultLang
 	}
 	return lang
 }