From 5e83cdbf2636030e655464c394ec14b70be608c7 Mon Sep 17 00:00:00 2001 From: wen Date: Thu, 8 Aug 2024 18:37:12 +0800 Subject: [PATCH 1/2] fix container name i18n --- go.mod | 2 +- go.sum | 2 ++ pagebuilder/model.go | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f587f4b1d..90d9925de 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/pquerna/otp v1.4.0 github.com/qor/oss v0.0.0-20240729105053-88484a799a79 github.com/qor5/web/v3 v3.0.6-0.20240808073627-bd2003d12e2c - github.com/qor5/x/v3 v3.0.7-0.20240808085055-02376b65a3f9 + github.com/qor5/x/v3 v3.0.7-0.20240808103450-13664afa0ba5 github.com/samber/lo v1.46.0 github.com/shurcooL/sanitized_anchor_name v1.0.0 github.com/spf13/cast v1.6.0 diff --git a/go.sum b/go.sum index 5cc18241b..df632e72e 100644 --- a/go.sum +++ b/go.sum @@ -323,6 +323,8 @@ github.com/qor5/x/v3 v3.0.7-0.20240808022508-35f1ab5b53fe h1:kZSRwsseo3Jwlk3Z/27 github.com/qor5/x/v3 v3.0.7-0.20240808022508-35f1ab5b53fe/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw= github.com/qor5/x/v3 v3.0.7-0.20240808085055-02376b65a3f9 h1:fuCaJ519NO5SL2LryGKNcYmgbrbiPxLMkun976s95d0= github.com/qor5/x/v3 v3.0.7-0.20240808085055-02376b65a3f9/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw= +github.com/qor5/x/v3 v3.0.7-0.20240808103450-13664afa0ba5 h1:GIIq/qk4VzVYHQMDJ++lHwa6L6y1O2yCWzXUX/p6CQw= +github.com/qor5/x/v3 v3.0.7-0.20240808103450-13664afa0ba5/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/pagebuilder/model.go b/pagebuilder/model.go index 619a18db3..8eb7470b3 100644 --- a/pagebuilder/model.go +++ b/pagebuilder/model.go @@ -469,7 +469,10 @@ func (b *ModelBuilder) renderContainersList(ctx *web.EventContext) (component h. } var listItems []h.HTMLComponent for _, builder := range group { - containerName := i18n.T(ctx.R, presets.ModelsI18nModuleKey, builder.name) + containerName := builder.name + if b.builder.ps.GetI18n() != nil { + containerName = i18n.T(ctx.R, presets.ModelsI18nModuleKey, builder.name) + } addContainerEvent := web.Plaid().EventFunc(AddContainerEvent). MergeQuery(true). Query(paramModelName, builder.name). @@ -716,7 +719,7 @@ func (b *ModelBuilder) addContainerToPage(ctx *web.EventContext, pageID int, con } modelID = reflectutils.MustGet(model, "ID").(uint) displayName := modelName - if b.builder.l10n != nil { + if b.builder.ps.GetI18n() != nil { displayName = i18n.T(ctx.R, presets.ModelsI18nModuleKey, modelName) } container := Container{ From 0039f11faa7832da20c67aa5399ccab7578da4f4 Mon Sep 17 00:00:00 2001 From: wen Date: Thu, 8 Aug 2024 19:05:44 +0800 Subject: [PATCH 2/2] i18n groupname --- example/admin/messages.go | 6 ++++++ pagebuilder/builder.go | 9 +++++++++ pagebuilder/model.go | 10 ++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/example/admin/messages.go b/example/admin/messages.go index 058ec25a6..246a0f8c2 100644 --- a/example/admin/messages.go +++ b/example/admin/messages.go @@ -173,6 +173,8 @@ type Messages_ModelsI18nModuleKey struct { WebHeader string WebHeadersColor string Header string + Navigation string + Content string WebFooter string WebFootersEnglishUrl string @@ -327,6 +329,8 @@ var Messages_zh_CN_ModelsI18nModuleKey = &Messages_ModelsI18nModuleKey{ WebHeader: "WebHeader", WebHeadersColor: "WebHeadersColor", Header: "Header", + Navigation: "Navigation", + Content: "Content", WebFooter: "WebFooter", WebFootersEnglishUrl: "WebFootersEnglishUrl", @@ -481,6 +485,8 @@ var Messages_ja_JP_ModelsI18nModuleKey = &Messages_ModelsI18nModuleKey{ WebHeader: "ウェブヘッダー", WebHeadersColor: "カラー", Header: "ヘッダー", + Navigation: "Navigation", + Content: "Content", WebFooter: "ウェブ用フッター", WebFootersEnglishUrl: "英語用URL", diff --git a/pagebuilder/builder.go b/pagebuilder/builder.go index db8723245..8c93a546c 100644 --- a/pagebuilder/builder.go +++ b/pagebuilder/builder.go @@ -1077,6 +1077,15 @@ func (b *Builder) configDemoContainer(pb *presets.Builder) (pm *presets.ModelBui pm = pb.Model(&DemoContainer{}).URIName("demo_containers").Label("Demo Containers") listing := pm.Listing("ModelName").SearchColumns("model_name") + listing.Field("ModelName").ComponentFunc(func(obj interface{}, field *presets.FieldContext, ctx *web.EventContext) h.HTMLComponent { + p := obj.(*DemoContainer) + modelName := p.ModelName + if b.ps.GetI18n() != nil { + modelName = i18n.T(ctx.R, presets.ModelsI18nModuleKey, modelName) + } + + return h.Td(h.Text(modelName)) + }) pm.LabelName(func(evCtx *web.EventContext, singular bool) string { msgr := i18n.MustGetModuleMessages(evCtx.R, I18nPageBuilderKey, Messages_en_US).(*Messages) if singular { diff --git a/pagebuilder/model.go b/pagebuilder/model.go index 8eb7470b3..416c8286a 100644 --- a/pagebuilder/model.go +++ b/pagebuilder/model.go @@ -461,6 +461,10 @@ func (b *ModelBuilder) renderContainersList(ctx *web.EventContext) (component h. break } groupName := group[0].group + + if b.builder.ps.GetI18n() != nil && groupName != "" { + groupName = i18n.T(ctx.R, presets.ModelsI18nModuleKey, groupName) + } if groupName == "" { groupName = msgr.Others } @@ -522,14 +526,16 @@ func (b *ModelBuilder) renderContainersList(ctx *web.EventContext) (component h. break } groupName := msgr.Shared - if b.builder.expendContainers { groupsNames = append(groupsNames, groupName) } var listItems []h.HTMLComponent for _, builder := range group { c := b.builder.ContainerByName(builder.ModelName) - containerName := i18n.T(ctx.R, presets.ModelsI18nModuleKey, c.name) + containerName := c.name + if b.builder.ps.GetI18n() != nil { + containerName = i18n.T(ctx.R, presets.ModelsI18nModuleKey, c.name) + } listItems = append(listItems, VListItem( VListItemTitle(h.Text(containerName)).Attr("@click", web.Plaid().