diff --git a/web/template/baseof.qtpl b/web/template/baseof.qtpl
index 8f9be69..1472cc7 100644
--- a/web/template/baseof.qtpl
+++ b/web/template/baseof.qtpl
@@ -10,6 +10,7 @@
T(format message.Reference, v ...any)
Title()
Lang()
+ Dir()
} %}
{% code
@@ -21,7 +22,7 @@ type BaseOf struct {
func NewBaseOf(site *domain.Site) BaseOf {
return BaseOf{
site: site,
- printer: message.NewPrinter(site.Language),
+ printer: message.NewPrinter(language.Make(site.Language.Code())),
}
}
%}
@@ -38,14 +39,16 @@ func NewBaseOf(site *domain.Site) BaseOf {
{% func (b BaseOf) Body() %}{% endfunc %}
{% func (b BaseOf) Lang() %}
- {% if b.site.Language != language.Und %}
- {%s b.site.Language.String() %}
- {% endif %}
+ {%s b.site.Language.Lang() %}
+{% endfunc %}
+
+{% func (b BaseOf) Dir() %}
+ {%s b.site.Language.Dir() %}
{% endfunc %}
{% func Template(p Pager) %}
-
+
diff --git a/web/template/baseof.qtpl.go b/web/template/baseof.qtpl.go
index 74ecd4d..f2fdb4c 100644
--- a/web/template/baseof.qtpl.go
+++ b/web/template/baseof.qtpl.go
@@ -51,10 +51,16 @@ type Pager interface {
StreamLang(qw422016 *qt422016.Writer)
//line web/template/baseof.qtpl:8
WriteLang(qq422016 qtio422016.Writer)
+//line web/template/baseof.qtpl:8
+ Dir() string
+//line web/template/baseof.qtpl:8
+ StreamDir(qw422016 *qt422016.Writer)
+//line web/template/baseof.qtpl:8
+ WriteDir(qq422016 qtio422016.Writer)
//line web/template/baseof.qtpl:8
}
-//line web/template/baseof.qtpl:16
+//line web/template/baseof.qtpl:17
type BaseOf struct {
printer *message.Printer
site *domain.Site
@@ -63,185 +69,218 @@ type BaseOf struct {
func NewBaseOf(site *domain.Site) BaseOf {
return BaseOf{
site: site,
- printer: message.NewPrinter(site.Language),
+ printer: message.NewPrinter(language.Make(site.Language.Code())),
}
}
-//line web/template/baseof.qtpl:30
-func (b BaseOf) StreamTitle(qw422016 *qt422016.Writer) {
//line web/template/baseof.qtpl:31
+func (b BaseOf) StreamTitle(qw422016 *qt422016.Writer) {
+//line web/template/baseof.qtpl:32
qw422016.E().S(b.site.Title)
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
}
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
func (b BaseOf) WriteTitle(qq422016 qtio422016.Writer) {
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
b.StreamTitle(qw422016)
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
qt422016.ReleaseWriter(qw422016)
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
}
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
func (b BaseOf) Title() string {
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
b.WriteTitle(qb422016)
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
qs422016 := string(qb422016.B)
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
return qs422016
-//line web/template/baseof.qtpl:32
+//line web/template/baseof.qtpl:33
}
-//line web/template/baseof.qtpl:34
-func (b BaseOf) StreamT(qw422016 *qt422016.Writer, key message.Reference, a ...any) {
//line web/template/baseof.qtpl:35
+func (b BaseOf) StreamT(qw422016 *qt422016.Writer, key message.Reference, a ...any) {
+//line web/template/baseof.qtpl:36
qw422016.E().S(b.printer.Sprintf(key, a...))
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
}
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
func (b BaseOf) WriteT(qq422016 qtio422016.Writer, key message.Reference, a ...any) {
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
b.StreamT(qw422016, key, a...)
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
qt422016.ReleaseWriter(qw422016)
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
}
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
func (b BaseOf) T(key message.Reference, a ...any) string {
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
b.WriteT(qb422016, key, a...)
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
qs422016 := string(qb422016.B)
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
return qs422016
-//line web/template/baseof.qtpl:36
+//line web/template/baseof.qtpl:37
}
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
func (b BaseOf) StreamBody(qw422016 *qt422016.Writer) {
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
}
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
func (b BaseOf) WriteBody(qq422016 qtio422016.Writer) {
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
b.StreamBody(qw422016)
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
qt422016.ReleaseWriter(qw422016)
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
}
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
func (b BaseOf) Body() string {
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
b.WriteBody(qb422016)
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
qs422016 := string(qb422016.B)
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
return qs422016
-//line web/template/baseof.qtpl:38
+//line web/template/baseof.qtpl:39
}
-//line web/template/baseof.qtpl:40
-func (b BaseOf) StreamLang(qw422016 *qt422016.Writer) {
//line web/template/baseof.qtpl:41
- if b.site.Language != language.Und {
+func (b BaseOf) StreamLang(qw422016 *qt422016.Writer) {
//line web/template/baseof.qtpl:42
- qw422016.E().S(b.site.Language.String())
+ qw422016.E().S(b.site.Language.Lang())
//line web/template/baseof.qtpl:43
- }
-//line web/template/baseof.qtpl:44
}
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
func (b BaseOf) WriteLang(qq422016 qtio422016.Writer) {
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
b.StreamLang(qw422016)
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
qt422016.ReleaseWriter(qw422016)
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
}
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
func (b BaseOf) Lang() string {
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
b.WriteLang(qb422016)
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
qs422016 := string(qb422016.B)
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
return qs422016
-//line web/template/baseof.qtpl:44
+//line web/template/baseof.qtpl:43
}
+//line web/template/baseof.qtpl:45
+func (b BaseOf) StreamDir(qw422016 *qt422016.Writer) {
//line web/template/baseof.qtpl:46
-func StreamTemplate(qw422016 *qt422016.Writer, p Pager) {
-//line web/template/baseof.qtpl:46
- qw422016.N().S(``)
-//line web/template/baseof.qtpl:53
- p.StreamTitle(qw422016)
-//line web/template/baseof.qtpl:53
- qw422016.N().S(``)
-//line web/template/baseof.qtpl:57
- p.StreamBody(qw422016)
-//line web/template/baseof.qtpl:57
- qw422016.N().S(``)
-//line web/template/baseof.qtpl:60
+ qw422016.E().S(b.site.Language.Dir())
+//line web/template/baseof.qtpl:47
}
-//line web/template/baseof.qtpl:60
-func WriteTemplate(qq422016 qtio422016.Writer, p Pager) {
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
+func (b BaseOf) WriteDir(qq422016 qtio422016.Writer) {
+//line web/template/baseof.qtpl:47
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/baseof.qtpl:60
- StreamTemplate(qw422016, p)
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
+ b.StreamDir(qw422016)
+//line web/template/baseof.qtpl:47
qt422016.ReleaseWriter(qw422016)
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
}
-//line web/template/baseof.qtpl:60
-func Template(p Pager) string {
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
+func (b BaseOf) Dir() string {
+//line web/template/baseof.qtpl:47
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/baseof.qtpl:60
- WriteTemplate(qb422016, p)
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
+ b.WriteDir(qb422016)
+//line web/template/baseof.qtpl:47
qs422016 := string(qb422016.B)
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
return qs422016
-//line web/template/baseof.qtpl:60
+//line web/template/baseof.qtpl:47
+}
+
+//line web/template/baseof.qtpl:49
+func StreamTemplate(qw422016 *qt422016.Writer, p Pager) {
+//line web/template/baseof.qtpl:49
+ qw422016.N().S(``)
+//line web/template/baseof.qtpl:56
+ p.StreamTitle(qw422016)
+//line web/template/baseof.qtpl:56
+ qw422016.N().S(``)
+//line web/template/baseof.qtpl:60
+ p.StreamBody(qw422016)
+//line web/template/baseof.qtpl:60
+ qw422016.N().S(``)
+//line web/template/baseof.qtpl:63
+}
+
+//line web/template/baseof.qtpl:63
+func WriteTemplate(qq422016 qtio422016.Writer, p Pager) {
+//line web/template/baseof.qtpl:63
+ qw422016 := qt422016.AcquireWriter(qq422016)
+//line web/template/baseof.qtpl:63
+ StreamTemplate(qw422016, p)
+//line web/template/baseof.qtpl:63
+ qt422016.ReleaseWriter(qw422016)
+//line web/template/baseof.qtpl:63
+}
+
+//line web/template/baseof.qtpl:63
+func Template(p Pager) string {
+//line web/template/baseof.qtpl:63
+ qb422016 := qt422016.AcquireByteBuffer()
+//line web/template/baseof.qtpl:63
+ WriteTemplate(qb422016, p)
+//line web/template/baseof.qtpl:63
+ qs422016 := string(qb422016.B)
+//line web/template/baseof.qtpl:63
+ qt422016.ReleaseByteBuffer(qb422016)
+//line web/template/baseof.qtpl:63
+ return qs422016
+//line web/template/baseof.qtpl:63
}
diff --git a/web/template/page.qtpl b/web/template/page.qtpl
index b5fdf7d..e9fca0d 100644
--- a/web/template/page.qtpl
+++ b/web/template/page.qtpl
@@ -1,6 +1,4 @@
{% import (
- "golang.org/x/text/language"
-
"source.toby3d.me/toby3d/home/internal/domain"
) %}
@@ -28,8 +26,16 @@ func NewPage(base BaseOf, page *domain.Page) Page {
{% endfunc %}
{% func (p Page) Lang() %}
- {% if p.page.Language != language.Und %}
- {%s p.page.Language.String() %}
+ {% if p.page.Language != domain.LanguageUnd %}
+ {%s p.page.Language.Lang() %}
+ {% else %}
+ {%= p.BaseOf.Lang() %}
+ {% endif %}
+{% endfunc %}
+
+{% func (p Page) Dir() %}
+ {% if p.page.Language != domain.LanguageUnd %}
+ {%s p.page.Language.Dir() %}
{% else %}
{%= p.BaseOf.Lang() %}
{% endif %}
diff --git a/web/template/page.qtpl.go b/web/template/page.qtpl.go
index 67fea97..f0c79bf 100644
--- a/web/template/page.qtpl.go
+++ b/web/template/page.qtpl.go
@@ -6,25 +6,23 @@ package template
//line web/template/page.qtpl:1
import (
- "golang.org/x/text/language"
-
"source.toby3d.me/toby3d/home/internal/domain"
)
-//line web/template/page.qtpl:7
+//line web/template/page.qtpl:5
import (
qtio422016 "io"
qt422016 "github.com/valyala/quicktemplate"
)
-//line web/template/page.qtpl:7
+//line web/template/page.qtpl:5
var (
_ = qtio422016.Copy
_ = qt422016.AcquireByteBuffer
)
-//line web/template/page.qtpl:8
+//line web/template/page.qtpl:6
type Page struct {
BaseOf
page *domain.Page
@@ -37,121 +35,162 @@ func NewPage(base BaseOf, page *domain.Page) Page {
}
}
-//line web/template/page.qtpl:22
+//line web/template/page.qtpl:20
func (p Page) StreamTitle(qw422016 *qt422016.Writer) {
-//line web/template/page.qtpl:23
+//line web/template/page.qtpl:21
if p.page.Title != "" {
-//line web/template/page.qtpl:24
+//line web/template/page.qtpl:22
qw422016.E().S(p.page.Title)
-//line web/template/page.qtpl:25
+//line web/template/page.qtpl:23
} else {
-//line web/template/page.qtpl:26
+//line web/template/page.qtpl:24
p.BaseOf.StreamTitle(qw422016)
-//line web/template/page.qtpl:27
+//line web/template/page.qtpl:25
}
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
}
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
func (p Page) WriteTitle(qq422016 qtio422016.Writer) {
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
p.StreamTitle(qw422016)
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
qt422016.ReleaseWriter(qw422016)
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
}
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
func (p Page) Title() string {
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
p.WriteTitle(qb422016)
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
qs422016 := string(qb422016.B)
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
return qs422016
-//line web/template/page.qtpl:28
+//line web/template/page.qtpl:26
}
-//line web/template/page.qtpl:30
+//line web/template/page.qtpl:28
func (p Page) StreamLang(qw422016 *qt422016.Writer) {
+//line web/template/page.qtpl:29
+ if p.page.Language != domain.LanguageUnd {
+//line web/template/page.qtpl:30
+ qw422016.E().S(p.page.Language.Lang())
//line web/template/page.qtpl:31
- if p.page.Language != language.Und {
-//line web/template/page.qtpl:32
- qw422016.E().S(p.page.Language.String())
-//line web/template/page.qtpl:33
} else {
-//line web/template/page.qtpl:34
+//line web/template/page.qtpl:32
p.BaseOf.StreamLang(qw422016)
-//line web/template/page.qtpl:35
+//line web/template/page.qtpl:33
}
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
}
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
func (p Page) WriteLang(qq422016 qtio422016.Writer) {
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
p.StreamLang(qw422016)
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
qt422016.ReleaseWriter(qw422016)
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
}
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
func (p Page) Lang() string {
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
p.WriteLang(qb422016)
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
qs422016 := string(qb422016.B)
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/page.qtpl:36
+//line web/template/page.qtpl:34
return qs422016
+//line web/template/page.qtpl:34
+}
+
//line web/template/page.qtpl:36
+func (p Page) StreamDir(qw422016 *qt422016.Writer) {
+//line web/template/page.qtpl:37
+ if p.page.Language != domain.LanguageUnd {
+//line web/template/page.qtpl:38
+ qw422016.E().S(p.page.Language.Dir())
+//line web/template/page.qtpl:39
+ } else {
+//line web/template/page.qtpl:40
+ p.BaseOf.StreamLang(qw422016)
+//line web/template/page.qtpl:41
+ }
+//line web/template/page.qtpl:42
}
-//line web/template/page.qtpl:38
-func (p Page) StreamBody(qw422016 *qt422016.Writer) {
-//line web/template/page.qtpl:38
- qw422016.N().S(``)
-//line web/template/page.qtpl:39
- qw422016.N().Z(p.page.Content)
-//line web/template/page.qtpl:39
- qw422016.N().S(`
`)
-//line web/template/page.qtpl:40
-}
-
-//line web/template/page.qtpl:40
-func (p Page) WriteBody(qq422016 qtio422016.Writer) {
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
+func (p Page) WriteDir(qq422016 qtio422016.Writer) {
+//line web/template/page.qtpl:42
qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/template/page.qtpl:40
- p.StreamBody(qw422016)
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
+ p.StreamDir(qw422016)
+//line web/template/page.qtpl:42
qt422016.ReleaseWriter(qw422016)
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
}
-//line web/template/page.qtpl:40
-func (p Page) Body() string {
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
+func (p Page) Dir() string {
+//line web/template/page.qtpl:42
qb422016 := qt422016.AcquireByteBuffer()
-//line web/template/page.qtpl:40
- p.WriteBody(qb422016)
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
+ p.WriteDir(qb422016)
+//line web/template/page.qtpl:42
qs422016 := string(qb422016.B)
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
qt422016.ReleaseByteBuffer(qb422016)
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
return qs422016
-//line web/template/page.qtpl:40
+//line web/template/page.qtpl:42
+}
+
+//line web/template/page.qtpl:44
+func (p Page) StreamBody(qw422016 *qt422016.Writer) {
+//line web/template/page.qtpl:44
+ qw422016.N().S(``)
+//line web/template/page.qtpl:45
+ qw422016.N().Z(p.page.Content)
+//line web/template/page.qtpl:45
+ qw422016.N().S(`
`)
+//line web/template/page.qtpl:46
+}
+
+//line web/template/page.qtpl:46
+func (p Page) WriteBody(qq422016 qtio422016.Writer) {
+//line web/template/page.qtpl:46
+ qw422016 := qt422016.AcquireWriter(qq422016)
+//line web/template/page.qtpl:46
+ p.StreamBody(qw422016)
+//line web/template/page.qtpl:46
+ qt422016.ReleaseWriter(qw422016)
+//line web/template/page.qtpl:46
+}
+
+//line web/template/page.qtpl:46
+func (p Page) Body() string {
+//line web/template/page.qtpl:46
+ qb422016 := qt422016.AcquireByteBuffer()
+//line web/template/page.qtpl:46
+ p.WriteBody(qb422016)
+//line web/template/page.qtpl:46
+ qs422016 := string(qb422016.B)
+//line web/template/page.qtpl:46
+ qt422016.ReleaseByteBuffer(qb422016)
+//line web/template/page.qtpl:46
+ return qs422016
+//line web/template/page.qtpl:46
}