Merge pull request #74 from vinser/73-language-menu-does-not-switch-language

vinser · web-flow · commit 5b1644e65bcb · 2025-02-26T11:05:09.000+05:00
Issue #73 bugfix
diff --git a/pkg/opds/opds.go b/pkg/opds/opds.go
@@ -1245,7 +1245,7 @@ func (h *Handler) getLanguage(r *http.Request) string {
 	if lang == "" {
 		lang = h.CFG.Locales.DEFAULT
 	}
-	if strings.Contains(h.CFG.Locales.ACCEPTED, lang) {
+	if _, ok := h.CFG.Locales.Languages[lang]; ok {
 		return lang
 	}
 	t, _, err := language.ParseAcceptLanguage(r.Header.Get("Accept-Language"))

Original file line number	Diff line number	Diff line change
`@@ -1245,7 +1245,7 @@ func (h Handler) getLanguage(r http.Request) string {`
`1245`	`1245`	`if lang == "" {`
`1246`	`1246`	`lang = h.CFG.Locales.DEFAULT`
`1247`	`1247`	`}`
`1248`		`- if strings.Contains(h.CFG.Locales.ACCEPTED, lang) {`
	`1248`	`+ if _, ok := h.CFG.Locales.Languages[lang]; ok {`
`1249`	`1249`	`return lang`
`1250`	`1250`	`}`
`1251`	`1251`	`t, _, err := language.ParseAcceptLanguage(r.Header.Get("Accept-Language"))`