forks/miniflux
1
0
Fork 0
Code Releases Activity

Add lang attribute to root HTML tag

Browse source 
Allow hyphens css property to work correctly and improve screen readers.
This commit is contained in:
Tai 2021-06-01 03:19:37 +07:00 committed by GitHub
parent 20cd023c07
commit 1fd4c4ef13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
template/engine.go
View file

@ -98,13 +98,13 @@ func (e *Engine) ParseTemplates() error {
} }
// Render process a template. // Render process a template.
func (e *Engine) Render(name, language string, data interface{}) []byte { func (e *Engine) Render(name string, data map[string]interface{}) []byte {
tpl, ok := e.templates[name] tpl, ok := e.templates[name]
if !ok { if !ok {
logger.Fatal("[Template] The template %s does not exists", name) logger.Fatal("[Template] The template %s does not exists", name)
} }
printer := locale.NewPrinter(language) printer := locale.NewPrinter(data["language"].(string))
// Functions that need to be declared at runtime. // Functions that need to be declared at runtime.
tpl.Funcs(template.FuncMap{ tpl.Funcs(template.FuncMap{

3
template/functions.go
View file

@ -75,6 +75,9 @@ func (f *funcMap) Map() template.FuncMap {
"contains": func(str, substr string) bool { "contains": func(str, substr string) bool {
return strings.Contains(str, substr) return strings.Contains(str, substr)
}, },
"replace": func(str, old string, new string) string {
return strings.Replace(str, old, new, 1)
},
"isodate": func(ts time.Time) string { "isodate": func(ts time.Time) string {
return ts.Format("2006-01-02 15:04:05") return ts.Format("2006-01-02 15:04:05")
}, },

2
template/templates/common/layout.html
View file

@ -1,6 +1,6 @@
{{ define "base" }} {{ define "base" }}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="{{ replace .language "_" "-"}}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{template "title" .}} - Miniflux</title> <title>{{template "title" .}} - Miniflux</title>

3
ui/view/view.go
View file

@ -28,7 +28,7 @@ func (v *View) Set(param string, value interface{}) *View {
// Render executes the template with arguments. // Render executes the template with arguments.
func (v *View) Render(template string) []byte { func (v *View) Render(template string) []byte {
return v.tpl.Render(template+".html", request.UserLanguage(v.r), v.params) return v.tpl.Render(template+".html", v.params)
} }
// New returns a new view with default parameters. // New returns a new view with default parameters.
@ -40,6 +40,7 @@ func New(tpl *template.Engine, r *http.Request, sess *session.Session) *View {
b.params["flashMessage"] = sess.FlashMessage(request.FlashMessage(r)) b.params["flashMessage"] = sess.FlashMessage(request.FlashMessage(r))
b.params["flashErrorMessage"] = sess.FlashErrorMessage(request.FlashErrorMessage(r)) b.params["flashErrorMessage"] = sess.FlashErrorMessage(request.FlashErrorMessage(r))
b.params["theme"] = theme b.params["theme"] = theme
b.params["language"] = request.UserLanguage(r)
b.params["theme_checksum"] = static.StylesheetBundleChecksums[theme] b.params["theme_checksum"] = static.StylesheetBundleChecksums[theme]
b.params["app_js_checksum"] = static.JavascriptBundleChecksums["app"] b.params["app_js_checksum"] = static.JavascriptBundleChecksums["app"]
b.params["sw_js_checksum"] = static.JavascriptBundleChecksums["service-worker"] b.params["sw_js_checksum"] = static.JavascriptBundleChecksums["service-worker"]