go-vise

commit 049511818ec7ea5e415f823bbb11c8420f125194
parent 1c71081a3b57888ed70d65e517d33363862e1d05
Author: lash <dev@holbrook.no>
Date:   Thu,  2 Jan 2025 20:57:56 +0000

remove separate menu po file

Diffstat:
M
dev/gettext/import/main.go
 | 
9
++++-----
M
resource/gettext.go
 | 
18
++++++++----------

2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/dev/gettext/import/main.go b/dev/gettext/import/main.go
@@ -20,8 +20,7 @@ import (
 var (
 	logg = logging.NewVanilla()
 	writeDomains = []string{
-		resource.TemplatePoDomain,
-		resource.MenuPoDomain,
+		resource.PoDomain,
 		resource.TemplateKeyPoDomain,
 		resource.MenuKeyPoDomain,
 	}
@@ -137,7 +136,7 @@ func(tr *translator) nodeFunc(node *debug.Node) error {
 			}
 			if def == "" {
 				def = fmt.Sprintf("\t\"%s\"\n", node.Name)
-				err = tr.writeTranslation(ww[2], node.Name, def, s)
+				err = tr.writeTranslation(ww[1], node.Name, def, s)
 			}
 			if i == 0 {
 				def = s
@@ -177,12 +176,12 @@ func(tr *translator) menuFunc(sym string) error {
 			}
 			if def == "" {
 				def = fmt.Sprintf("\t\"%s\"\n", sym)
-				err = tr.writeTranslation(ww[3], sym, def, s)
+				err = tr.writeTranslation(ww[2], sym, def, s)
 			}
 			if i == 0 {
 				def = s
 			}
-			err = tr.writeTranslation(ww[1], sym, def, s)
+			err = tr.writeTranslation(ww[0], sym, def, s)
 			if err != nil {
 				return err
 			}
diff --git a/resource/gettext.go b/resource/gettext.go
@@ -9,10 +9,9 @@ import (
 )
 
 const (
-	TemplatePoDomain = "template"
-	MenuPoDomain = "menu"
-	TemplateKeyPoDomain = "default"
-	MenuKeyPoDomain = "default_menu"
+	PoDomain = "default"
+	TemplateKeyPoDomain = "x-vise"
+	MenuKeyPoDomain = "x-vise_menu"
 )
 
 type PoResource struct {
@@ -34,8 +33,7 @@ func NewPoResource(defaultLanguage lang.Language, path string) *PoResource {
 
 func(p *PoResource) WithLanguage(ln lang.Language) *PoResource {
 	o := gotext.NewLocale(p.path, ln.Code)
-	o.AddDomain(MenuPoDomain)
-	o.AddDomain(TemplatePoDomain)
+	o.AddDomain(PoDomain)
 	if ln.Code == p.defaultLanguage.Code {
 		o.AddDomain(TemplateKeyPoDomain)
 		o.AddDomain(MenuKeyPoDomain)
@@ -44,7 +42,7 @@ func(p *PoResource) WithLanguage(ln lang.Language) *PoResource {
 	return p
 }
 
-func(p *PoResource) get(ctx context.Context, sym string, domain string) (string, error) {
+func(p *PoResource) get(ctx context.Context, sym string, domain string, menu bool) (string, error) {
 	s := sym
 	ln, ok := lang.LanguageFromContext(ctx)
 	if !ok {
@@ -53,7 +51,7 @@ func(p *PoResource) get(ctx context.Context, sym string, domain string) (string,
 	o, ok := p.tr[p.defaultLanguage.Code]
 	if ok {
 		keyDomain := TemplateKeyPoDomain
-		if domain == MenuPoDomain {
+		if menu {
 			keyDomain = MenuKeyPoDomain
 		}
 		s = o.GetD(keyDomain, sym)
@@ -66,9 +64,9 @@ func(p *PoResource) get(ctx context.Context, sym string, domain string) (string,
 }
 
 func(p *PoResource) GetMenu(ctx context.Context, sym string) (string, error) {
-	return p.get(ctx, sym, MenuPoDomain)
+	return p.get(ctx, sym, PoDomain, true)
 }
 
 func(p *PoResource) GetTemplate(ctx context.Context, sym string) (string, error) {
-	return p.get(ctx, sym, TemplatePoDomain)
+	return p.get(ctx, sym, PoDomain, false)
 }