From 882a3467db6b8be4d695575d4851d825edfab987 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Thu, 21 Jan 2021 14:16:03 +0000 Subject: [PATCH] fix language settings loading --- lang.go | 3 +++ lang/admin/{de-DE.json => de-de.json} | 0 lang/email/{de-DE.json => de-de.json} | 0 lang/form/{de-DE.json => de-de.json} | 0 models.go | 2 +- 5 files changed, 4 insertions(+), 1 deletion(-) rename lang/admin/{de-DE.json => de-de.json} (100%) rename lang/email/{de-DE.json => de-de.json} (100%) rename lang/form/{de-DE.json => de-de.json} (100%) diff --git a/lang.go b/lang.go index a8c1495..d265bbd 100644 --- a/lang.go +++ b/lang.go @@ -19,6 +19,7 @@ func (ls *adminLangs) getOptions(chosen string) (string, []string) { i := 0 for _, lang := range *ls { opts[i] = lang.Meta.Name + i++ } return chosenLang, opts } @@ -39,6 +40,7 @@ func (ls *formLangs) getOptions(chosen string) (string, []string) { i := 0 for _, lang := range *ls { opts[i] = lang.Meta.Name + i++ } return chosenLang, opts } @@ -58,6 +60,7 @@ func (ls *emailLangs) getOptions(chosen string) (string, []string) { i := 0 for _, lang := range *ls { opts[i] = lang.Meta.Name + i++ } return chosenLang, opts } diff --git a/lang/admin/de-DE.json b/lang/admin/de-de.json similarity index 100% rename from lang/admin/de-DE.json rename to lang/admin/de-de.json diff --git a/lang/email/de-DE.json b/lang/email/de-de.json similarity index 100% rename from lang/email/de-DE.json rename to lang/email/de-de.json diff --git a/lang/form/de-DE.json b/lang/form/de-de.json similarity index 100% rename from lang/form/de-DE.json rename to lang/form/de-de.json diff --git a/models.go b/models.go index 4a26e1a..8c2b5de 100644 --- a/models.go +++ b/models.go @@ -147,7 +147,7 @@ type setting struct { } type section struct { - Meta langMeta `json:"meta"` + Meta meta `json:"meta"` Order []string `json:"order"` Settings map[string]setting `json:"settings"` }