Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-20 18:35:57 +00:00
Code Releases Activity

add support for fs.FS, embed.FS (in addition of string and http.FileSystem) for i18n locales and view engine's templates

Browse Source
This commit is contained in:
Gerasimos (Makis) Maropoulos
2022-09-25 20:40:56 +03:00
parent 4cd0621018
commit 512ed6ffc0
29 changed files with 276 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
_examples/i18n/template-embedded/locales/el-GR/other.ini → _examples/i18n/template-embedded/embedded/locales/el-GR/other.ini
View File

0
_examples/i18n/template-embedded/locales/el-GR/user.ini → _examples/i18n/template-embedded/embedded/locales/el-GR/user.ini
View File

0
_examples/i18n/template-embedded/locales/en-US/other.ini → _examples/i18n/template-embedded/embedded/locales/en-US/other.ini
View File

0
_examples/i18n/template-embedded/locales/en-US/user.ini → _examples/i18n/template-embedded/embedded/locales/en-US/user.ini
View File

6
_examples/i18n/template-embedded/main.go
View File

@@ -8,8 +8,8 @@ import (
"github.com/kataras/iris/v12"
)
//go:embed locales/*
var filesystem embed.FS
//go:embed embedded/locales/*
var embeddedFS embed.FS
func main() {
app := newApp()
@@ -31,7 +31,7 @@ func newApp() *iris.Application {
// Instead of:
// err := app.I18n.Load("./locales/*/*.ini", "en-US", "el-GR")
// Apply the below in order to build with embedded locales inside your executable binary.
err := app.I18n.LoadFS(filesystem, ".", "en-US", "el-GR")
err := app.I18n.LoadFS(embeddedFS, "./embedded/locales/*/*.ini", "en-US", "el-GR")
if err != nil {
panic(err)
}

2
_examples/view/context-view-engine/views/admin/layouts/main.html
View File

@@ -9,6 +9,6 @@
{{ template "content" .}}
<h4>Copyright &copy; 2020 Admin</h4>
<h4>Copyright &copy; 2022 Admin</h4>
</body>
</html>

24
_examples/view/embedding-templates-into-app/templates/layouts/layout.html → _examples/view/embedding-templates-into-app/embedded/templates/layouts/layout.html
View File

@@ -1,12 +1,12 @@
<html>
<head>
<title>Layout</title>
</head>
<body>
<h1>This is the global layout</h1>
<br />
<!-- Render the current template here -->
{{ yield }}
</body>
</html>
<html>
<head>
<title>Layout</title>
</head>
<body>
<h1>This is the global layout</h1>
<br />
<!-- Render the current template here -->
{{ yield }}
</body>
</html>

24
_examples/view/embedding-templates-into-app/templates/layouts/mylayout.html → _examples/view/embedding-templates-into-app/embedded/templates/layouts/mylayout.html
View File

@@ -1,12 +1,12 @@
<html>
<head>
<title>my Layout</title>
</head>
<body>
<h1>This is the layout for the /my/ and /my/other routes only</h1>
<br />
<!-- Render the current template here -->
{{ yield }}
</body>
</html>
<html>
<head>
<title>my Layout</title>
</head>
<body>
<h1>This is the layout for the /my/ and /my/other routes only</h1>
<br />
<!-- Render the current template here -->
{{ yield }}
</body>
</html>

14
_examples/view/embedding-templates-into-app/templates/page1.html → _examples/view/embedding-templates-into-app/embedded/templates/page1.html
View File

@@ -1,7 +1,7 @@
<div style="background-color: black; color: blue">
<h1>Page 1 {{ greet "iris developer"}}</h1>
{{ render "partials/page1_partial1.html"}}
</div>
<div style="background-color: black; color: blue">
<h1>Page 1 {{ greet "iris developer"}}</h1>
{{ render "partials/page1_partial1.html"}}
</div>

6
_examples/view/embedding-templates-into-app/templates/partials/page1_partial1.html → _examples/view/embedding-templates-into-app/embedded/templates/partials/page1_partial1.html
View File

@@ -1,3 +1,3 @@
<div style="background-color: white; color: red">
<h1>Page 1's Partial 1</h1>
</div>
<div style="background-color: white; color: red">
<h1>Page 1's Partial 1</h1>
</div>

7
_examples/view/embedding-templates-into-app/main.go
View File

@@ -7,13 +7,14 @@ import (
"github.com/kataras/iris/v12/x/errors"
)
//go:embed templates/*
var embeddedTemplatesFS embed.FS
//go:embed embedded/*
var embeddedFS embed.FS
func main() {
app := iris.New()
tmpl := iris.HTML(embeddedTemplatesFS, ".html")
tmpl := iris.HTML(embeddedFS, ".html").RootDir("embedded/templates")
tmpl.Layout("layouts/layout.html")
tmpl.AddFunc("greet", func(s string) string {
return "Greetings " + s + "!"