diff --git a/main.go b/main.go index 685fdf1..db5b857 100644 --- a/main.go +++ b/main.go @@ -190,21 +190,12 @@ func healthHandler(w http.ResponseWriter, r *http.Request) { } func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc { - funcMap := template.FuncMap{"t": func(key string, args ...string) string { - 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)) + tmpl := template.Must(template.New("launcher").Parse(launcherHTML)) return func(w http.ResponseWriter, r *http.Request) { user := r.Header.Get("Remote-User") groupsHeader := r.Header.Get("Remote-Groups") userGroups := strings.Split(groupsHeader, ",") - lang := getUserLang(r) settings, _ := loadSettings(os.Getenv("CONFIG_DIR")) var allowedApps []AppEntry @@ -220,7 +211,6 @@ func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc { User string IsAdmin bool Apps []AppEntry - Lang string CompanyLogo string Subtitle string }{ @@ -229,7 +219,6 @@ func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc { User: user, IsAdmin: strings.Contains(groupsHeader, "admins"), Apps: allowedApps, - Lang: lang, CompanyLogo: settings.Company.Logo, Subtitle: settings.Company.Subtitle, } @@ -595,7 +584,7 @@ const landingPageHTML = ` ` const launcherHTML = ` - + @@ -630,10 +619,9 @@ const launcherHTML = ` {{if .Subtitle}}

{{.Subtitle}}

{{end}}
- {{t "welcome" "user" .User}} - {{if .IsAdmin}}{{t "admin_panel"}}{{end}} - {{t "settings"}} - {{t "logout"}} + Welcome, {{.User}} + Settings + Logout
{{range .Apps}}