core/go-i18n
8
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

[agent/codex:gpt-5.4-mini] Read ~/spec/code/core/go/i18n/RFC.md fully. Find ONE feature... #43

Merged
Virgil merged 1 commit from agent/read---spec-code-core-go-i18n-rfc-md-ful into dev 2026-04-01 23:19:22 +00:00
Conversation 1 Commits 1 Files changed 2 +44 -11
2 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
service.go
View file

@ -359,8 +359,8 @@ func (s *Service) resolveWithFallback(messageID string, data any) string {
}
func (s *Service) tryResolve(lang, key string, data any) string {
context, gender, formality := s.getEffectiveContextGenderAndFormality(data)
for _, lookupKey := range lookupVariants(key, context, gender, formality) {
context, gender, location, formality := s.getEffectiveContextGenderLocationAndFormality(data)
for _, lookupKey := range lookupVariants(key, context, gender, location, formality) {
if text := s.resolveMessage(lang, lookupKey, data); text != "" {
return text
}
@ -388,24 +388,25 @@ func (s *Service) resolveMessage(lang, key string, data any) string {
return text
}
func (s *Service) getEffectiveContextGenderAndFormality(data any) (string, string, Formality) {
func (s *Service) getEffectiveContextGenderLocationAndFormality(data any) (string, string, string, Formality) {
if ctx, ok := data.(*TranslationContext); ok && ctx != nil {
formality := ctx.FormalityValue()
if formality == FormalityNeutral {
formality = s.formality
}
return ctx.ContextString(), ctx.GenderString(), formality
return ctx.ContextString(), ctx.GenderString(), "", formality
}
if subj, ok := data.(*Subject); ok && subj != nil {
formality := subj.formality
if formality == FormalityNeutral {
formality = s.formality
}
return "", subj.gender, formality
return "", subj.gender, subj.location, formality
}
if m, ok := data.(map[string]any); ok {
var context string
var gender string
var location string
formality := s.formality
if v, ok := m["Context"].(string); ok {
context = core.Trim(v)
@ -413,6 +414,9 @@ func (s *Service) getEffectiveContextGenderAndFormality(data any) (string, strin
if v, ok := m["Gender"].(string); ok {
gender = core.Trim(v)
}
if v, ok := m["Location"].(string); ok {
location = core.Trim(v)
}
if v, ok := m["Formality"]; ok {
switch f := v.(type) {
case Formality:
@ -428,9 +432,9 @@ func (s *Service) getEffectiveContextGenderAndFormality(data any) (string, strin
}
}
}
return context, gender, formality
return context, gender, location, formality
}
return "", "", s.getEffectiveFormality(data)
return "", "", "", s.getEffectiveFormality(data)
}
func (s *Service) getEffectiveFormality(data any) Formality {
@ -462,26 +466,50 @@ func (s *Service) getEffectiveFormality(data any) Formality {
return s.formality
}
func lookupVariants(key, context, gender string, formality Formality) []string {
func lookupVariants(key, context, gender, location string, formality Formality) []string {
var variants []string
if context != "" {
if gender != "" && location != "" && formality != FormalityNeutral {
variants = append(variants, key+"._"+context+"._"+gender+"._"+location+"._"+formality.String())
}
if gender != "" && location != "" {
variants = append(variants, key+"._"+context+"._"+gender+"._"+location)
}
if gender != "" && formality != FormalityNeutral {
variants = append(variants, key+"._"+context+"._"+gender+"._"+formality.String())
}
if gender != "" {
variants = append(variants, key+"._"+context+"._"+gender)
}
if location != "" && formality != FormalityNeutral {
variants = append(variants, key+"._"+context+"._"+location+"._"+formality.String())
}
if location != "" {
variants = append(variants, key+"._"+context+"._"+location)
}
if formality != FormalityNeutral {
variants = append(variants, key+"._"+context+"._"+formality.String())
}
variants = append(variants, key+"._"+context)
}
if gender != "" && location != "" && formality != FormalityNeutral {
variants = append(variants, key+"._"+gender+"._"+location+"._"+formality.String())
}
if gender != "" && location != "" {
variants = append(variants, key+"._"+gender+"._"+location)
}
if gender != "" && formality != FormalityNeutral {
variants = append(variants, key+"._"+gender+"._"+formality.String())
}
if gender != "" {
if formality != FormalityNeutral {
variants = append(variants, key+"._"+gender+"._"+formality.String())
}
variants = append(variants, key+"._"+gender)
}
if location != "" && formality != FormalityNeutral {
variants = append(variants, key+"._"+location+"._"+formality.String())
}
if location != "" {
variants = append(variants, key+"._"+location)
}
if formality != FormalityNeutral {
variants = append(variants, key+"._"+formality.String())
}

5
service_test.go
View file

@ -215,6 +215,7 @@ func TestServiceTranslationContext(t *testing.T) {
"direction.right._navigation._feminine._formal": "right, madam",
"direction.right._correctness": "correct",
"direction.right._correctness._formal": "correct, sir",
"welcome._workspace": "welcome aboard",
"welcome._feminine": "welcome, ma'am",
})
@ -245,6 +246,10 @@ func TestServiceTranslationContext(t *testing.T) {
if got := svc.T("welcome", S("user", "Alice").Gender("feminine")); got != "welcome, ma'am" {
t.Errorf("T(welcome, S(user, Alice).Gender(feminine)) = %q, want %q", got, "welcome, ma'am")
}
if got := svc.T("welcome", S("user", "Alice").In("workspace")); got != "welcome aboard" {
t.Errorf("T(welcome, S(user, Alice).In(workspace)) = %q, want %q", got, "welcome aboard")
}
}
func TestServiceTranslationContextExtrasInTemplates(t *testing.T) {