go embed fs with path

Author: llonchj

go.mod

@@ -1,7 +1,5 @@
 module github.com/leonelquinteros/gotext
 
-// go: no requirements found in Gopkg.lock
-
 require golang.org/x/tools v0.1.12
 
-go 1.13
+go 1.16

locale.go

@@ -21,30 +21,29 @@ multiple languages at the same time by working with this object.
 
 Example:
 
-    import (
-	"encoding/gob"
-	"bytes"
-	    "fmt"
-	    "github.com/leonelquinteros/gotext"
-    )
+	    import (
+		"encoding/gob"
+		"bytes"
+		    "fmt"
+		    "github.com/leonelquinteros/gotext"
+	    )
 
-    func main() {
-        // Create Locale with library path and language code
-        l := gotext.NewLocale("/path/to/i18n/dir", "en_US")
+	    func main() {
+	        // Create Locale with library path and language code
+	        l := gotext.NewLocale("/path/to/i18n/dir", "en_US")
 
-        // Load domain '/path/to/i18n/dir/en_US/LC_MESSAGES/default.{po,mo}'
-        l.AddDomain("default")
+	        // Load domain '/path/to/i18n/dir/en_US/LC_MESSAGES/default.{po,mo}'
+	        l.AddDomain("default")
 
-        // Translate text from default domain
-        fmt.Println(l.Get("Translate this"))
+	        // Translate text from default domain
+	        fmt.Println(l.Get("Translate this"))
 
-        // Load different domain ('/path/to/i18n/dir/en_US/LC_MESSAGES/extras.{po,mo}')
-        l.AddDomain("extras")
-
-        // Translate text from domain
-        fmt.Println(l.GetD("extras", "Translate this"))
-    }
+	        // Load different domain ('/path/to/i18n/dir/en_US/LC_MESSAGES/extras.{po,mo}')
+	        l.AddDomain("extras")
 
+	        // Translate text from domain
+	        fmt.Println(l.GetD("extras", "Translate this"))
+	    }
 */
 type Locale struct {
 	// Path to locale files.
@@ -83,6 +82,14 @@ func NewLocaleFS(l string, filesystem fs.FS) *Locale {
 	return loc
 }
 
+// NewLocaleFSWithPath returns a Locale working with a fs.FS on a p path folder.
+func NewLocaleFSWithPath(l string, filesystem fs.FS, p string) *Locale {
+	loc := NewLocale("", l)
+	loc.fs = filesystem
+	loc.path = p
+	return loc
+}
+
 func (l *Locale) findExt(dom, ext string) string {
 	filename := path.Join(l.path, l.lang, "LC_MESSAGES", dom+"."+ext)
 	if l.fileExists(filename) {
@@ -333,7 +340,7 @@ func (l *Locale) GetNDC(dom, str, plural string, n int, ctx string, vars ...inte
 	return Printf(plural, vars...)
 }
 
-//GetTranslations returns a copy of all translations in all domains of this locale. It does not support contexts.
+// GetTranslations returns a copy of all translations in all domains of this locale. It does not support contexts.
 func (l *Locale) GetTranslations() map[string]*Translation {
 	all := make(map[string]*Translation)
 

locale_test.go

@@ -6,6 +6,7 @@
 package gotext
 
 import (
+	"embed"
 	"os"
 	"path"
 	"testing"
@@ -703,6 +704,9 @@ func TestLocaleBinaryEncoding(t *testing.T) {
 	}
 }
 
+//go:embed fixtures
+var localeFS embed.FS
+
 func TestLocale_GetTranslations(t *testing.T) {
 	var locales []*Locale
 	{ // test os
@@ -711,6 +715,9 @@ func TestLocale_GetTranslations(t *testing.T) {
 	{ // test fs
 		locales = append(locales, NewLocaleFS("en_US", os.DirFS("fixtures")))
 	}
+	{ // test embed
+		locales = append(locales, NewLocaleFSWithPath("en_US", localeFS, "fixtures"))
+	}
 
 	for _, l := range locales {
 		l.AddDomain("default")