Home Explore Help
Sign In
LBP
/
miniflux_v2
mirror of https://github.com/miniflux/v2.git
4
0
Fork 0
Files Issues 0 Wiki
Browse Source

Add lang attribute to root HTML tag

Allow hyphens css property to work correctly and improve screen readers.
Tai 4 years ago
parent
20cd023c07
commit
1fd4c4ef13
4 changed files with 8 additions and 4 deletions
Split View Show Diff Stats
  1. 2 2
      template/engine.go
  2. 3 0
      template/functions.go
  3. 1 1
      template/templates/common/layout.html
  4. 2 1
      ui/view/view.go

+ 2 - 2
template/engine.go
View File 

@@ -98,13 +98,13 @@ func (e *Engine) ParseTemplates() error {
 
 }
 
 
 // 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]
 
 	if !ok {
 
 		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.
 
 	tpl.Funcs(template.FuncMap{

+ 3 - 0
template/functions.go
View File 

@@ -75,6 +75,9 @@ func (f *funcMap) Map() template.FuncMap {
 
 		"contains": func(str, substr string) bool {
 
 			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 {
 
 			return ts.Format("2006-01-02 15:04:05")
 
 		},

+ 1 - 1
template/templates/common/layout.html
View File 

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

+ 2 - 1
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.
 
 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.
 
@@ -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["flashErrorMessage"] = sess.FlashErrorMessage(request.FlashErrorMessage(r))
 
 	b.params["theme"] = theme
 
+	b.params["language"] = request.UserLanguage(r)
 
 	b.params["theme_checksum"] = static.StylesheetBundleChecksums[theme]
 
 	b.params["app_js_checksum"] = static.JavascriptBundleChecksums["app"]
 
 	b.params["sw_js_checksum"] = static.JavascriptBundleChecksums["service-worker"]