lexton-it/NextWks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: roll back launcher template to simple version, no translations in templates

Browse source
This commit is contained in:
Claus Lohmar 2026-07-08 15:53:45 +01:00
parent f6a18dd8e2
commit 207f7532be
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
main.go
View file

@ -190,21 +190,12 @@ func healthHandler(w http.ResponseWriter, r *http.Request) {
} }
func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc { func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc {
funcMap := template.FuncMap{"t": func(key string, args ...string) string { tmpl := template.Must(template.New("launcher").Parse(launcherHTML))
lang := "en"
settings, _ := loadSettings(os.Getenv("CONFIG_DIR"))
if settings != nil && settings.Company.Language != "" {
lang = settings.Company.Language
}
return T(lang, key, args...)
}}
tmpl := template.Must(template.New("launcher").Funcs(funcMap).Parse(launcherHTML))
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
user := r.Header.Get("Remote-User") user := r.Header.Get("Remote-User")
groupsHeader := r.Header.Get("Remote-Groups") groupsHeader := r.Header.Get("Remote-Groups")
userGroups := strings.Split(groupsHeader, ",") userGroups := strings.Split(groupsHeader, ",")
lang := getUserLang(r)
settings, _ := loadSettings(os.Getenv("CONFIG_DIR")) settings, _ := loadSettings(os.Getenv("CONFIG_DIR"))
var allowedApps []AppEntry var allowedApps []AppEntry
@ -220,7 +211,6 @@ func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc {
User string User string
IsAdmin bool IsAdmin bool
Apps []AppEntry Apps []AppEntry
Lang string
CompanyLogo string CompanyLogo string
Subtitle string Subtitle string
}{ }{
@ -229,7 +219,6 @@ func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc {
User: user, User: user,
IsAdmin: strings.Contains(groupsHeader, "admins"), IsAdmin: strings.Contains(groupsHeader, "admins"),
Apps: allowedApps, Apps: allowedApps,
Lang: lang,
CompanyLogo: settings.Company.Logo, CompanyLogo: settings.Company.Logo,
Subtitle: settings.Company.Subtitle, Subtitle: settings.Company.Subtitle,
} }
@ -595,7 +584,7 @@ const landingPageHTML = `<!DOCTYPE html>
</html>` </html>`
const launcherHTML = `<!DOCTYPE html> const launcherHTML = `<!DOCTYPE html>
<html lang="{{.Lang}}"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -630,10 +619,9 @@ const launcherHTML = `<!DOCTYPE html>
{{if .Subtitle}}<p>{{.Subtitle}}</p>{{end}} {{if .Subtitle}}<p>{{.Subtitle}}</p>{{end}}
</header> </header>
<div class="user-banner"> <div class="user-banner">
<span>{{t "welcome" "user" .User}}</span> <span>Welcome, {{.User}}</span>
{{if .IsAdmin}}<a href="/config">{{t "admin_panel"}}</a>{{end}} <a href="/settings">Settings</a>
<a href="/settings">{{t "settings"}}</a> <a href="https://auth.nextwks.eu/logout">Logout</a>
<a href="https://auth.nextwks.eu/logout">{{t "logout"}}</a>
</div> </div>
<div class="grid"> <div class="grid">
{{range .Apps}} {{range .Apps}}