Merge pull request revel#768 from klauspost/i18n-plugable-message

brendensoares · brendensoares · commit a83447fdaae2 · 2015-09-23T09:51:21.000-07:00
i18n: Make Message translation function pluggable
diff --git a/controller.go b/controller.go
@@ -260,7 +260,7 @@ func (c *Controller) Redirect(val interface{}, args ...interface{}) Result {
 //
 // The current language is set by the i18n plugin.
 func (c *Controller) Message(message string, args ...interface{}) (value string) {
-	return Message(c.Request.Locale, message, args...)
+	return MessageFunc(c.Request.Locale, message, args...)
 }
 
 // SetAction sets the action that is being invoked in the current request.
diff --git a/i18n.go b/i18n.go
@@ -25,6 +25,14 @@ var (
 	messages map[string]*config.Config
 )
 
+// Setting MessageFunc allows you to override the translation interface.
+//
+// Set this to your own function that translates to the current locale.
+// This allows you to set up your own loading and logging of translated texts.
+//
+// See Message(...) in i18n.go for example of function.
+var MessageFunc func(locale, message string, args ...interface{}) (value string) = Message
+
 // Return all currently loaded message languages.
 func MessageLanguages() []string {
 	languages := make([]string, len(messages))
diff --git a/template.go b/template.go
@@ -126,7 +126,7 @@ var (
 			if !ok {
 				return ""
 			}
-			return template.HTML(Message(str, message, args...))
+			return template.HTML(MessageFunc(str, message, args...))
 		},
 
 		// Replaces newlines with <br>

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ func (c *Controller) Redirect(val interface{}, args ...interface{}) Result {`
`260`	`260`	`//`
`261`	`261`	`// The current language is set by the i18n plugin.`
`262`	`262`	`func (c *Controller) Message(message string, args ...interface{}) (value string) {`
`263`		`- return Message(c.Request.Locale, message, args...)`
	`263`	`+ return MessageFunc(c.Request.Locale, message, args...)`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`// SetAction sets the action that is being invoked in the current request.`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ var (`
`126`	`126`	`if !ok {`
`127`	`127`	`return ""`
`128`	`128`	`}`
`129`		`- return template.HTML(Message(str, message, args...))`
	`129`	`+ return template.HTML(MessageFunc(str, message, args...))`
`130`	`130`	`},`
`131`	`131`
`132`	`132`	`// Replaces newlines with <br>`