update

Author: admpub

context.go

@@ -256,6 +256,8 @@ type Context interface {
 	Accept() *Accepts
 	Protocol() string
 	Site() string
+	SiteRoot() string
+	LangURI(lang string) string
 	FullRequestURI() string
 	RequestURI() string
 	Scheme() string

context_x_base.go

@@ -500,11 +500,11 @@ func (c *XContext) URLFor(uri string, relative ...bool) string {
 	if len(uri) == 0 {
 		return c.Site()
 	}
-	return c.siteRoot() + c.RelativeURL(uri)
+	return c.SiteRoot() + c.RelativeURL(uri)
 }
 
 func (c *XContext) URLByName(name string, args ...interface{}) string {
-	return c.siteRoot() + c.echo.URIWithContext(c, name, args...)
+	return c.SiteRoot() + c.echo.URIWithContext(c, name, args...)
 }
 
 func (c *XContext) RelativeURLByName(name string, args ...interface{}) string {

context_x_request.go

@@ -507,15 +507,15 @@ func (c *XContext) Protocol() string {
 
 // Site returns base site url as scheme://domain/ type.
 func (c *XContext) Site() string {
-	return c.siteRoot() + `/`
+	return c.SiteRoot() + `/`
 }
 
-func (c *XContext) siteRoot() string {
+func (c *XContext) SiteRoot() string {
 	return c.Scheme() + `://` + c.Request().Host()
 }
 
 func (c *XContext) FullRequestURI() string {
-	return c.siteRoot() + c.RequestURI()
+	return c.SiteRoot() + c.RequestURI()
 }
 
 func (c *XContext) RequestURI() string {
@@ -529,6 +529,21 @@ func (c *XContext) RequestURI() string {
 	return c.Request().URI()
 }
 
+func (c *XContext) DispatchURI() string {
+	q := c.Request().URL().RawQuery()
+	if len(q) > 0 {
+		q = `?` + q
+	}
+	return c.DispatchPath() + q
+}
+
+func (c *XContext) LangURI(lang string) string {
+	if len(lang) > 0 {
+		lang = `/` + lang
+	}
+	return lang + c.DispatchURI()
+}
+
 // Scheme returns request scheme as `http` or `https`.
 func (c *XContext) Scheme() string {
 	scheme := c.Header(HeaderXForwardedProto)

render_data.go

@@ -3,7 +3,6 @@ package echo
 import (
 	"database/sql"
 	"html/template"
-	"strings"
 	"time"
 
 	"github.com/admpub/humanize"
@@ -163,8 +162,16 @@ func (r *RenderData) Site() string {
 	return r.ctx.Site()
 }
 
+func (r *RenderData) SiteRoot() string {
+	return r.ctx.SiteRoot()
+}
+
+func (r *RenderData) LangURI(lang string) string {
+	return r.ctx.LangURI(lang)
+}
+
 func (r *RenderData) SiteURI() string {
-	return r.Site() + strings.TrimPrefix(r.URI(), `/`)
+	return r.SiteRoot() + r.URI()
 }
 
 func (r *RenderData) FullURL(myURL string) string {