A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
refactor(plugin): try to refactor plugin translation struct
LinkinStars5bd8b1895b01
diff --git a/internal/controller/connector_controller.go b/internal/controller/connector_controller.goindex fcdf6e70..f53ccec1 100644--- a/internal/controller/connector_controller.go+++ b/internal/controller/connector_controller.go@@ -114,8 +114,9 @@ func (cc *ConnectorController) ConnectorsInfo(ctx *gin.Context) {resp := make([]*schema.ConnectorInfoResp, 0)_ = plugin.CallConnector(func(fn plugin.Connector) error {+ connectorName := fn.ConnectorName()resp = append(resp, &schema.ConnectorInfoResp{- Name: fn.ConnectorName()(ctx),+ Name: connectorName.Translate(ctx),Icon: fn.ConnectorLogoSVG(),Link: fmt.Sprintf("%s%s%s%s", general.SiteUrl,commonRouterPrefix, ConnectorLoginRouterPrefix, fn.ConnectorSlugName()),@@ -174,8 +175,9 @@ func (cc *ConnectorController) ConnectorsUserInfo(ctx *gin.Context) {resp := make([]*schema.ConnectorUserInfoResp, 0)_ = plugin.CallConnector(func(fn plugin.Connector) error {externalID := userExternalLoginMapping[fn.ConnectorSlugName()]+ connectorName := fn.ConnectorName()resp = append(resp, &schema.ConnectorUserInfoResp{- Name: fn.ConnectorName()(ctx),+ Name: connectorName.Translate(ctx),Icon: fn.ConnectorLogoSVG(),Link: fmt.Sprintf("%s%s%s%s", general.SiteUrl,commonRouterPrefix, ConnectorLoginRouterPrefix, fn.ConnectorSlugName()),diff --git a/internal/controller_admin/plugin_controller.go b/internal/controller_admin/plugin_controller.goindex e86d20b7..38a38d92 100644--- a/internal/controller_admin/plugin_controller.go+++ b/internal/controller_admin/plugin_controller.go@@ -49,9 +49,9 @@ func (pc *PluginController) GetPluginList(ctx *gin.Context) {_ = plugin.CallBase(func(base plugin.Base) error {info := base.Info()resp = append(resp, &schema.GetPluginListResp{- Name: info.Name(ctx),+ Name: info.Name.Translate(ctx),SlugName: info.SlugName,- Description: info.Description(ctx),+ Description: info.Description.Translate(ctx),Version: info.Version,Enabled: plugin.StatusManager.IsEnabled(info.SlugName),HaveConfig: pluginConfigMapping[info.SlugName],@@ -133,9 +133,9 @@ func (pc *PluginController) GetPluginConfig(ctx *gin.Context) {return nil}info := base.Info()- resp.Name = info.Name(ctx)+ resp.Name = info.Name.Translate(ctx)resp.SlugName = info.SlugName- resp.Description = info.Description(ctx)+ resp.Description = info.Description.Translate(ctx)resp.Version = info.Versionreturn nil})diff --git a/internal/schema/plugin_admin_schema.go b/internal/schema/plugin_admin_schema.goindex cc8be272..56a57c51 100644--- a/internal/schema/plugin_admin_schema.go+++ b/internal/schema/plugin_admin_schema.go@@ -48,8 +48,8 @@ func (g *GetPluginConfigResp) SetConfigFields(ctx *gin.Context, fields []plugin.configField := ConfigField{Name: field.Name,Type: string(field.Type),- Title: field.Title(ctx),- Description: field.Description(ctx),+ Title: field.Title.Translate(ctx),+ Description: field.Description.Translate(ctx),Required: field.Required,Value: field.Value,UIOptions: ConfigFieldUIOptions{@@ -57,13 +57,11 @@ func (g *GetPluginConfigResp) SetConfigFields(ctx *gin.Context, fields []plugin.InputType: string(field.UIOptions.InputType),},}- if field.UIOptions.Placeholder != nil {- configField.UIOptions.Placeholder = field.UIOptions.Placeholder(ctx)- }+ configField.UIOptions.Placeholder = field.UIOptions.Placeholder.Translate(ctx)for _, option := range field.Options {configField.Options = append(configField.Options, ConfigFieldOption{- Label: option.Label(ctx),+ Label: option.Label.Translate(ctx),Value: option.Value,})}diff --git a/plugin/sample/connector.go b/plugin/sample/connector.gonew file mode 100644index 00000000..4c26886a--- /dev/null+++ b/plugin/sample/connector.go@@ -0,0 +1,20 @@+package sample++import "github.com/answerdev/answer/plugin"++type Connector struct {+}++func init() {+ plugin.Register(&Connector{})+}++func (g *Connector) Info() plugin.Info {+ return plugin.Info{+ Name: plugin.MakeTranslator("plugin.connector.name"),+ SlugName: "connector",+ //Description: plugin.MakeTranslator("plugin.connector.description"),+ Author: "answerdev",+ Version: "0.0.1",+ }+}diff --git a/plugin/sample/connector_test.go b/plugin/sample/connector_test.gonew file mode 100644index 00000000..43cff4ed--- /dev/null+++ b/plugin/sample/connector_test.go@@ -0,0 +1,26 @@+package sample++import (+ "fmt"+ "net/http"+ "net/http/httptest"+ "testing"++ "github.com/answerdev/answer/plugin"+ "github.com/gin-gonic/gin"+)++func TestConnector_Info(t *testing.T) {+ c, _ := gin.CreateTestContext(httptest.NewRecorder())+ c.Request, _ = http.NewRequest("", "", nil)+ c.Request.Header.Set("Accept-Language", "en_US")+ _ = plugin.CallBase(func(base plugin.Base) error {+ info := base.Info()+ fmt.Println(info.Name.Translate(c))+ fmt.Println(info.SlugName)+ fmt.Println(info.Description.Translate(c))+ fmt.Println(info.Author)+ fmt.Println(info.Version)+ return nil+ })+}