atcoder
diff --git a/‎controller.go
Lines changed: 2 additions & 1 deletion b/‎controller.go
Lines changed: 2 additions & 1 deletion
diff --git a/‎i18n.go
Lines changed: 3 additions & 3 deletions b/‎i18n.go
Lines changed: 3 additions & 3 deletions
diff --git a/‎results.go
Lines changed: 5 additions & 4 deletions b/‎results.go
Lines changed: 5 additions & 4 deletions
diff --git a/‎revel.go
Lines changed: 46 additions & 1 deletion b/‎revel.go
Lines changed: 46 additions & 1 deletion
@@ -124,7 +124,8 @@ func (c *Controller) RenderTemplate(templatePath string) Result {
 	c.setStatusIfNil(http.StatusOK)
 
 	// Get the Template.
-	template, err := MainTemplateLoader.Template(templatePath)
+	lang, _ := c.ViewArgs[CurrentLocaleViewArg].(string)
+	template, err := MainTemplateLoader.TemplateLang(templatePath, lang)
 	if err != nil {
 		return c.RenderError(err)
 	}
 
@@ -16,8 +16,8 @@ import (
 )
 
 const (
-	// CurrentLocaleRenderArg the key for the current locale render arg value
-	CurrentLocaleRenderArg = "currentLocale"
+	// CurrentLocaleViewArg the key for the current locale view arg value
+	CurrentLocaleViewArg = "currentLocale"
 
 	messageFilesDirectory  = "messages"
 	messageFilePattern     = `^\w+\.[a-zA-Z]{2}$`
@@ -202,7 +202,7 @@ func I18nFilter(c *Controller, fc []Filter) {
 // Set the current locale controller argument (CurrentLocaleControllerArg) with the given locale.
 func setCurrentLocaleControllerArguments(c *Controller, locale string) {
 	c.Request.Locale = locale
-	c.ViewArgs[CurrentLocaleRenderArg] = locale
+	c.ViewArgs[CurrentLocaleViewArg] = locale
 }
 
 // Determine whether the given request has valid Accept-Language value.
 
@@ -44,11 +44,11 @@ func (r ErrorResult) Apply(req *Request, resp *Response) {
 	if contentType == DefaultFileContentType {
 		contentType = "text/plain"
 	}
-
+	lang, _ := r.ViewArgs[CurrentLocaleViewArg].(string)
 	// Get the error template.
 	var err error
 	templatePath := fmt.Sprintf("errors/%d.%s", status, format)
-	tmpl, err := MainTemplateLoader.Template(templatePath)
+	tmpl, err := MainTemplateLoader.TemplateLang(templatePath, lang)
 
 	// This func shows a plaintext error message, in case the template rendering
 	// doesn't work.
@@ -231,12 +231,13 @@ func (r *RenderTemplateResult) render(req *Request, resp *Response, wr io.Writer
 	}
 
 	var templateContent []string
-	templateName, line, description := parseTemplateError(err)
+	templateName, line, description := ParseTemplateError(err)
 	if templateName == "" {
 		templateName = r.Template.Name()
 		templateContent = r.Template.Content()
 	} else {
-		if tmpl, err := MainTemplateLoader.Template(templateName); err == nil {
+		lang, _ := r.ViewArgs[CurrentLocaleViewArg].(string)
+		if tmpl, err := MainTemplateLoader.TemplateLang(templateName, lang); err == nil {
 			templateContent = tmpl.Content()
 		}
 	}
 
@@ -16,18 +16,27 @@ import (
 
 	"github.com/agtorre/gocolorize"
 	"github.com/revel/config"
+	"sort"
 )
 
 const (
 	// RevelImportPath Revel framework import path
 	RevelImportPath = "github.com/revel/revel"
 )
+const (
+	// Called when templates are going to be refreshed (receivers are registered template engines added to the template.engine conf option)
+	TEMPLATE_REFRESH_REQUESTED = iota
+	// Called when templates are refreshed (receivers are registered template engines added to the template.engine conf option)
+	TEMPLATE_REFRESH_COMPLETED
 
+)
 type revelLogs struct {
 	c gocolorize.Colorize
 	w io.Writer
 }
 
+type EventHandler func(typeOf int, value interface{}) (responseOf int)
+
 func (r *revelLogs) Write(p []byte) (n int, err error) {
 	return r.w.Write([]byte(r.c.Paint(string(p))))
 }
@@ -111,6 +120,7 @@ var (
 	// Private
 	secretKey []byte // Key used to sign cookies. An empty key disables signing.
 	packaged  bool   // If true, this is running from a pre-built package.
+	initEventList = []EventHandler{} // Event handler list for receiving events
 )
 
 // Init initializes Revel -- it provides paths for getting around the app.
@@ -230,6 +240,25 @@ func Init(mode, importPath, srcPath string) {
 	INFO.Printf("Initialized Revel v%s (%s) for %s", Version, BuildDate, MinimumGoVersion)
 }
 
+// Fires system events from revel
+func fireEvent(key int, value interface{}) (response int) {
+	for _, handler := range initEventList {
+		response |= handler(key, value)
+	}
+	return
+}
+
+// Add event handler to listen for all system events
+func AddInitEventHandler(handler EventHandler) {
+	initEventList = append(initEventList, handler)
+	return
+}
+
+func SetSecretKey(newKey []byte) error {
+	secretKey = newKey
+	return nil
+}
+
 // Create a logger using log.* directives in app.conf plus the current settings
 // on the default logger.
 func getLogger(name string) *log.Logger {
@@ -325,7 +354,17 @@ type Module struct {
 }
 
 func loadModules() {
+	keys := []string{}
 	for _, key := range Config.Options("module.") {
+		keys = append(keys, key)
+	}
+	// Reorder module order by key name, a poor mans sort but at least it is consistent
+	sort.Strings(keys)
+	for _, key := range keys {
+		println("Sorted keys", key)
+
+	}
+	for _, key := range keys {
 		moduleImportPath := Config.StringDefault(key, "")
 		if moduleImportPath == "" {
 			continue
@@ -335,7 +374,13 @@ func loadModules() {
 		if err != nil {
 			log.Fatalln("Failed to load module.  Import of", moduleImportPath, "failed:", err)
 		}
-		addModule(key[len("module."):], moduleImportPath, modulePath)
+		// Drop anything between module.???.<name of module>
+		subKey := key[len("module."):]
+		if index := strings.Index(subKey, "."); index > -1 {
+			subKey = subKey[index+1:]
+		}
+
+		addModule(subKey, moduleImportPath, modulePath)
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,8 @@ func (c *Controller) RenderTemplate(templatePath string) Result {`
`124`	`124`	`c.setStatusIfNil(http.StatusOK)`
`125`	`125`
`126`	`126`	`// Get the Template.`
`127`		`- template, err := MainTemplateLoader.Template(templatePath)`
	`127`	`+ lang, _ := c.ViewArgs[CurrentLocaleViewArg].(string)`
	`128`	`+ template, err := MainTemplateLoader.TemplateLang(templatePath, lang)`
`128`	`129`	`if err != nil {`
`129`	`130`	`return c.RenderError(err)`
`130`	`131`	`}`