diff --git a/Makefile b/Makefile index 379226d..f21beaa 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ po/%.po: $(POT_FILE) $(POT_FILE): $(HTML_FILES) $(GO_FILES) xgettext $(XGETTEXTFLAGS) --language=Scheme --output=$@ --keyword=pgettext:1,2c $(HTML_FILES) - xgettext $(XGETTEXTFLAGS) --language=C --output=$@ --join-existing $(GO_FILES) + xgettext $(XGETTEXTFLAGS) --language=C --output=$@ --keyword=Gettext:1 --keyword=GettextNoop:1 --join-existing $(GO_FILES) test-deploy: sqitch deploy --db-name $(PGDATABASE) diff --git a/pkg/locale/locale.go b/pkg/locale/locale.go index 7ef458e..5d96797 100644 --- a/pkg/locale/locale.go +++ b/pkg/locale/locale.go @@ -52,6 +52,14 @@ func newLocale(lang availableLanguage) *Locale { } } +func (l *Locale) Gettext(str string) string { + return l.GetD(l.GetDomain(), str) +} + +func (l *Locale) GettextNoop(str string) string { + return str +} + func Match(r *http.Request, locales Locales, defaultLocale *Locale, matcher language.Matcher) *Locale { var locale *Locale // TODO: find user locale