update

Author: admpub

context_x_base.go

@@ -467,6 +467,9 @@ func (c *XContext) SetDispatchPath(route string) {
 }
 
 func (c *XContext) DispatchPath() string {
+	if len(c.dispatchRoute) == 0 {
+		return c.Request().URL().Path()
+	}
 	return c.dispatchRoute
 }
 

middleware/language/language.go

@@ -107,9 +107,6 @@ func (a *Language) Set(lang string, on bool, args ...bool) *Language {
 
 func (a *Language) DetectURI(c echo.Context) string {
 	dispatchPath := c.DispatchPath()
-	if len(dispatchPath) == 0 {
-		dispatchPath = c.Request().URL().Path()
-	}
 	p := strings.TrimPrefix(dispatchPath, `/`)
 	s := strings.Index(p, `/`)
 	var lang string

router.go

@@ -619,10 +619,7 @@ func NewRouter(e *Echo) *Router {
 }
 
 func (r *Router) Handle(c Context) Handler {
-	if len(c.DispatchPath()) > 0 {
-		return r.Dispatch(c, c.DispatchPath())
-	}
-	return r.Dispatch(c, c.Request().URL().Path())
+	return r.Dispatch(c, c.DispatchPath())
 }
 
 func (r *Router) Dispatch(c Context, path string, _method ...string) Handler {