diff --git a/pkg/app/app.go b/pkg/app/app.go index a26bb60..3e75c61 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -6,6 +6,7 @@ package app import ( + "context" "net/http" "golang.org/x/text/language" @@ -28,7 +29,7 @@ type App struct { } func New(db *database.DB, avatarsDir string) (http.Handler, error) { - locales := locale.MustGetAll(db) + locales := locale.MustGetAll(context.Background(), db) static := http.FileServer(http.Dir("web/static")) profile, err := newProfileHandler(static, avatarsDir) if err != nil { diff --git a/pkg/locale/locale.go b/pkg/locale/locale.go index 76f0352..61d438c 100644 --- a/pkg/locale/locale.go +++ b/pkg/locale/locale.go @@ -31,8 +31,8 @@ func (m Locales) Tags() []language.Tag { return keys } -func MustGetAll(db *database.DB) Locales { - availableLanguages := mustGetAvailableLanguages(db) +func MustGetAll(ctx context.Context, db *database.DB) Locales { + availableLanguages := mustGetAvailableLanguages(ctx, db) locales := map[language.Tag]*Locale{} for _, lang := range availableLanguages { locale := newLocale(lang) @@ -85,8 +85,8 @@ type availableLanguage struct { currencyPattern string } -func mustGetAvailableLanguages(db *database.DB) []availableLanguage { - rows, err := db.Query(context.Background(), "select lang_tag, currency_pattern from language where selectable") +func mustGetAvailableLanguages(ctx context.Context, db *database.DB) []availableLanguage { + rows, err := db.Query(ctx, "select lang_tag, currency_pattern from language where selectable") if err != nil { panic(err) }