Update: rename translate func

Charliego3 · Feb 26, 2022 · 7a3efe3 · 7a3efe3
1 parent a021bcc
commit 7a3efe3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/gin_test.go b/gin_test.go
@@ -44,11 +44,11 @@ func TestSimple(t *testing.T) {
 	i = nil
 	business := func(engine *ginServer) {
 		engine.GET("/:messageId", func(ctx *gin.Context) {
-			ctx.String(http.StatusOK, MustGetMessage(ctx.Param("messageId")))
+			ctx.String(http.StatusOK, MustTr(ctx.Param("messageId")))
 		})
 
 		engine.GET("/:messageId/:name", func(ctx *gin.Context) {
-			ctx.String(http.StatusOK, MustGetMessage(&i18n.LocalizeConfig{
+			ctx.String(http.StatusOK, MustTr(&i18n.LocalizeConfig{
 				MessageID: ctx.Param("messageId"),
 				TemplateData: map[string]string{
 					"Name": ctx.Param("name"),
@@ -102,19 +102,19 @@ func TestLocalize(t *testing.T) {
 	i = nil
 	business := func(engine *ginServer) {
 		engine.GET("/default/:messageId", func(ctx *gin.Context) {
-			ctx.String(http.StatusOK, MustGetMessage(ctx.Param("messageId")))
+			ctx.String(http.StatusOK, MustTr(ctx.Param("messageId")))
 		})
 
 		engine.GET("/:messageId", func(ctx *gin.Context) {
-			ctx.String(http.StatusOK, MustGetMessage(&i18n.LocalizeConfig{
+			ctx.String(http.StatusOK, MustTr(&i18n.LocalizeConfig{
 				MessageID:   ctx.Param("messageId"),
 				PluralCount: ctx.Query("count"),
 			}))
 		})
 
 		engine.GET("/:messageId/:name", func(ctx *gin.Context) {
 			count := ctx.Query("count")
-			ctx.String(http.StatusOK, MustGetMessage(&i18n.LocalizeConfig{
+			ctx.String(http.StatusOK, MustTr(&i18n.LocalizeConfig{
 				MessageID: ctx.Param("messageId"),
 				TemplateData: map[string]string{
 					"Name":  ctx.Param("name"),

diff --git a/i18n.go b/i18n.go
@@ -75,7 +75,7 @@ func (i *I18n) AddLoader(loader Loader) {
 	i.SetLocalizer(i.language)
 }
 
-func (i *I18n) GetMessage(p interface{}) (string, error) {
+func (i *I18n) Tr(p interface{}) (string, error) {
 	var lang language.Tag
 	if i.ctx != nil {
 		if value, ok := i.ctx.Value(languageKey).(language.Tag); ok {
@@ -176,12 +176,12 @@ func Localize(defaultLang language.Tag, opts ...Option) ContextHandler {
 	return ContextHandler{}
 }
 
-func GetMessage(messageId interface{}) (string, error) {
-	return i.GetMessage(messageId)
+func Tr(messageId interface{}) (string, error) {
+	return i.Tr(messageId)
 }
 
-func MustGetMessage(messageId interface{}) string {
-	message, _ := GetMessage(messageId)
+func MustTr(messageId interface{}) string {
+	message, _ := Tr(messageId)
 	return message
 }