Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions i18n/gi18n/gi18n_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ const (
// Manager for i18n contents, it is concurrent safe, supporting hot reload.
type Manager struct {
mu sync.RWMutex
data map[string]map[string]string // Translating map.
pattern string // Pattern for regex parsing.
pathType pathType // Path type for i18n files.
options Options // configuration options.
data map[string]map[string]any // Translating map.
pattern string // Pattern for regex parsing.
pathType pathType // Path type for i18n files.
options Options // configuration options.
}

// Options is used for i18n object configuration.
Expand Down Expand Up @@ -183,16 +183,23 @@ func (m *Manager) Translate(ctx context.Context, content string) string {
if data == nil {
return content
}
// Convert to json
j := gjson.New(data)
// Parse content as name.
if v, ok := data[content]; ok {
return v
return gconv.String(v)
}
// Parse content as variables container.
result, _ := gregex.ReplaceStringFuncMatch(
m.pattern, content,
func(match []string) string {
if v, ok := data[match[1]]; ok {
return v
// Handling the Case Where Key Names Themselves Contain Hierarchical Symbols "."
if strings.Contains(match[1], ".") {
j.SetViolenceCheck(true)
}
v := j.Get(match[1])
if v != nil {
return v.String()
}
// return match[1] will return the content between delimiters
// return match[0] will return the original content
Expand All @@ -213,7 +220,7 @@ func (m *Manager) GetContent(ctx context.Context, key string) string {
transLang = lang
}
if data, ok := m.data[transLang]; ok {
return data[key]
return gconv.String(data[key])
}
return ""
}
Expand Down Expand Up @@ -254,7 +261,7 @@ func (m *Manager) init(ctx context.Context) {
lang string
array []string
)
m.data = make(map[string]map[string]string)
m.data = make(map[string]map[string]any)
for _, file := range files {
name = file.Name()
path = name[len(m.options.Path)+1:]
Expand All @@ -265,12 +272,12 @@ func (m *Manager) init(ctx context.Context) {
lang = gfile.Name(array[0])
}
if m.data[lang] == nil {
m.data[lang] = make(map[string]string)
m.data[lang] = make(map[string]any)
}
options := gjson.Options{Type: gfile.ExtName(name)}
if j, err := gjson.LoadWithOptions(file.Content(), options); err == nil {
for k, v := range j.Var().Map() {
m.data[lang][k] = gconv.String(v)
m.data[lang][k] = v
}
} else {
intlog.Errorf(ctx, "load i18n file '%s' failed: %+v", name, err)
Expand All @@ -287,7 +294,7 @@ func (m *Manager) init(ctx context.Context) {
lang string
array []string
)
m.data = make(map[string]map[string]string)
m.data = make(map[string]map[string]any)
for _, file := range files {
path = file[len(m.options.Path)+1:]
array = strings.Split(path, gfile.Separator)
Expand All @@ -297,11 +304,11 @@ func (m *Manager) init(ctx context.Context) {
lang = gfile.Name(array[0])
}
if m.data[lang] == nil {
m.data[lang] = make(map[string]string)
m.data[lang] = make(map[string]any)
}
if j, err := gjson.LoadPath(file, gjson.Options{}); err == nil {
for k, v := range j.Var().Map() {
m.data[lang][k] = gconv.String(v)
m.data[lang][k] = v
}
} else {
intlog.Errorf(ctx, "load i18n file '%s' failed: %+v", file, err)
Expand Down
Loading