3 Commits
v0.1.0 ... main

Author SHA1 Message Date
131cfb8068 Init once 2022-12-26 15:38:43 +03:00
273ce8c7a1 Do not fail if builder not initialized 2022-12-08 00:12:03 +03:00
68d90a0496 Implement errors.Is for Error type 2022-10-25 17:54:27 +03:00
2 changed files with 33 additions and 12 deletions

View File

@@ -61,3 +61,12 @@ func (e *Error) Translate(ctx context.Context) string {
return printer.Sprintf(e.key, translatedParams...)
}
func (e *Error) Is(other error) bool {
switch err := other.(type) {
case *Error:
return e.key == err.key
}
return false
}

View File

@@ -4,6 +4,7 @@ import (
"context"
"io/fs"
"net/http"
"sync"
"github.com/pkg/errors"
"golang.org/x/text/language"
@@ -16,7 +17,8 @@ import (
var defaultLanguage = language.Russian
var (
builder *catalog.Builder
initOnce sync.Once
builder *catalog.Builder
supportedLanguages []language.Tag
supportedLanguagesMap = map[string]struct{}{}
@@ -43,21 +45,27 @@ func TryTranslate(ctx context.Context, obj interface{}) (string, bool) {
}
func Init(fs fs.ReadDirFS) error {
if builder != nil {
return nil
}
var err error
initCatalog, err := internal.InitBuilder(fs)
if err != nil {
return errors.Wrap(err, "init catalog")
}
initOnce.Do(func() {
if builder != nil {
return
}
builder = initCatalog
initCatalog, err := internal.InitBuilder(fs)
if err != nil {
err = errors.Wrap(err, "init catalog")
// Fill the local cache
GetLanguages()
return
}
return nil
builder = initCatalog
// Fill the local cache
GetLanguages()
})
return err
}
func GetPrinter(lang language.Tag) *message.Printer {
@@ -77,6 +85,10 @@ func GetPrinter(lang language.Tag) *message.Printer {
func GetLanguages() []language.Tag {
if supportedLanguages == nil {
if builder == nil {
return nil
}
supportedLanguages = builder.Languages()
for idx := range supportedLanguages {