update module to own version

gotext.go

@@ -1,25 +1,25 @@
 /*
-* Package gotext implements GNU gettext utilities.
+ Package gotext implements GNU gettext utilities.
-*
+
-* For quick/simple translations you can use the package level functions directly.
+ For quick/simple translations you can use the package level functions directly.
-*
+
-*     import (
+     import (
-* 	    "fmt"
+ 	    "fmt"
-* 	    "git.deineagentur.com/DeineAgenturUG/gotext"
+ 	    "git.deineagentur.com/DeineAgenturUG/gotext"
-*     )
+     )
-*
+
-*     func main() {
+     func main() {
-*         // Configure package
+         // Configure package
-*         gotext.Configure("/path/to/locales/root/dir", "en_UK", "domain-name")
+         gotext.Configure("/path/to/locales/root/dir", "en_UK", "domain-name")
-*
+
-*         // Translate text from default domain
+         // Translate text from default domain
-*         fmt.Println(gotext.Get("My text on 'domain-name' domain"))
+         fmt.Println(gotext.Get("My text on 'domain-name' domain"))
-*
+
-*         // Translate text from a different domain without reconfigure
+         // Translate text from a different domain without reconfigure
-*         fmt.Println(gotext.GetD("domain2", "Another text on a different domain"))
+         fmt.Println(gotext.GetD("domain2", "Another text on a different domain"))
-*     }
+     }
-*
+
- */
+*/
 package gotext
 
 import (

gotext_test.go

@@ -2,7 +2,6 @@ package gotext
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 	"sync"
 	"testing"
@@ -99,14 +98,14 @@ msgstr "Another text on another domain"
   `
 
 	// Create Locales directory on default location
-	dirname := path.Join("/tmp", "en_US")
+	dirname := filepath.Join("/tmp", "en_US")
 	err := os.MkdirAll(dirname, os.ModePerm)
 	if err != nil {
 		t.Fatalf("Can't create test directory: %s", err.Error())
 	}
 
 	// Write PO content to default domain file
-	filename := path.Join(dirname, "default.po")
+	filename := filepath.Join(dirname, "default.po")
 
 	f, err := os.Create(filename)
 	if err != nil {
@@ -118,7 +117,7 @@ msgstr "Another text on another domain"
 		t.Fatalf("Can't write to test file: %s", err.Error())
 	}
 
-	anotherFilename := path.Join(dirname, "another.po")
+	anotherFilename := filepath.Join(dirname, "another.po")
 
 	af, err := os.Create(anotherFilename)
 	if err != nil {
@@ -198,14 +197,14 @@ msgstr[1] ""
 	`
 
 	// Create Locales directory on default location
-	dirname := path.Join("/tmp", "en_US")
+	dirname := filepath.Join("/tmp", "en_US")
 	err := os.MkdirAll(dirname, os.ModePerm)
 	if err != nil {
 		t.Fatalf("Can't create test directory: %s", err.Error())
 	}
 
 	// Write PO content to default domain file
-	filename := path.Join(dirname, "default.po")
+	filename := filepath.Join(dirname, "default.po")
 
 	f, err := os.Create(filename)
 	if err != nil {
@@ -318,19 +317,19 @@ msgstr[1] "Custom ctx translations"
 	`
 
 	// Create Locales directory and files on temp location
-	dirname := path.Join("/tmp", "en_US")
+	dirname := filepath.Join("/tmp", "en_US")
 	err := os.MkdirAll(dirname, os.ModePerm)
 	if err != nil {
 		t.Fatalf("Can't create test directory: %s", err.Error())
 	}
 
-	fDefault, err := os.Create(path.Join(dirname, "default.po"))
+	fDefault, err := os.Create(filepath.Join(dirname, "default.po"))
 	if err != nil {
 		t.Fatalf("Can't create test file: %s", err.Error())
 	}
 	defer fDefault.Close()
 
-	fCustom, err := os.Create(path.Join(dirname, "custom.po"))
+	fCustom, err := os.Create(filepath.Join(dirname, "custom.po"))
 	if err != nil {
 		t.Fatalf("Can't create test file: %s", err.Error())
 	}
@@ -408,14 +407,14 @@ msgstr "Some random Translation in a context"
 	`
 
 	// Create Locales directory on default location
-	dirname := path.Join("/tmp", "en_US")
+	dirname := filepath.Join("/tmp", "en_US")
 	err := os.MkdirAll(dirname, os.ModePerm)
 	if err != nil {
 		t.Fatalf("Can't create test directory: %s", err.Error())
 	}
 
 	// Write PO content to default domain file
-	filename := path.Join("/tmp", GetDomain()+".po")
+	filename := filepath.Join("/tmp", GetDomain()+".po")
 
 	f, err := os.Create(filename)
 	if err != nil {
@@ -437,7 +436,7 @@ msgstr "Some random Translation in a context"
 			defer wg.Done()
 
 			GetLibrary()
-			SetLibrary(path.Join("/tmp", "gotextlib"))
+			SetLibrary(filepath.Join("/tmp", "gotextlib"))
 			GetDomain()
 			SetDomain("default")
 			GetLanguage()

locale.go

@@ -9,11 +9,11 @@ import (
 	"bytes"
 	"encoding/gob"
 	"os"
-	"path"
+	"path/filepath"
 	"sync"
 )
 
-/**
+/*
 Locale wraps the entire i18n collection for a single language (locale)
 It's used by the package functions, but it can also be used independently to handle
 multiple languages at the same time by working with this object.
@@ -21,10 +21,10 @@ multiple languages at the same time by working with this object.
 Example:
 
     import (
-	"encoding/gob"
+		"encoding/gob"
-	"bytes"
+		"bytes"
-	    "fmt"
+		"fmt"
-	    "git.deineagentur.com/DeineAgenturUG/gotext"
+		"git.deineagentur.com/DeineAgenturUG/gotext"
     )
 
     func main() {
@@ -42,9 +42,8 @@ Example:
 
         // Translate text from domain
 		fmt.Println(l.GetD("extras", "Translate this"))
-    }
+	}
 */
-
 type Locale struct {
 	// Path to locale files.
 	path string
@@ -72,26 +71,41 @@ func NewLocale(p, l string) *Locale {
 	}
 }
 
+//SetLang ...
+func (l *Locale) SetLang(lang string) {
+	l.lang = lang
+}
+
+//GetLang ...
+func (l *Locale) GetLang() string {
+	return l.lang
+}
+
+//SetPath ...
+func (l *Locale) SetPath(path string) {
+	l.path = path
+}
+
 func (l *Locale) findExt(dom, ext string) string {
-	filename := path.Join(l.path, l.lang, "LC_MESSAGES", dom+"."+ext)
+	filename := filepath.Join(l.path, l.lang, "LC_MESSAGES", dom+"."+ext)
 	if _, err := os.Stat(filename); err == nil {
 		return filename
 	}
 
 	if len(l.lang) > 2 {
-		filename = path.Join(l.path, l.lang[:2], "LC_MESSAGES", dom+"."+ext)
+		filename = filepath.Join(l.path, l.lang[:2], "LC_MESSAGES", dom+"."+ext)
 		if _, err := os.Stat(filename); err == nil {
 			return filename
 		}
 	}
 
-	filename = path.Join(l.path, l.lang, dom+"."+ext)
+	filename = filepath.Join(l.path, l.lang, dom+"."+ext)
 	if _, err := os.Stat(filename); err == nil {
 		return filename
 	}
 
 	if len(l.lang) > 2 {
-		filename = path.Join(l.path, l.lang[:2], dom+"."+ext)
+		filename = filepath.Join(l.path, l.lang[:2], dom+"."+ext)
 		if _, err := os.Stat(filename); err == nil {
 			return filename
 		}

locale_test.go

@@ -7,7 +7,7 @@ package gotext
 
 import (
 	"os"
-	"path"
+	"path/filepath"
 	"testing"
 )
 
@@ -62,14 +62,14 @@ msgstr "More Translation"
 	`
 
 	// Create Locales directory with simplified language code
-	dirname := path.Join("/tmp", "en", "LC_MESSAGES")
+	dirname := filepath.Join("/tmp", "en", "LC_MESSAGES")
 	err := os.MkdirAll(dirname, os.ModePerm)
 	if err != nil {
 		t.Fatalf("Can't create test directory: %s", err.Error())
 	}
 
 	// Write PO content to file
-	filename := path.Join(dirname, "my_domain.po")
+	filename := filepath.Join(dirname, "my_domain.po")
 
 	f, err := os.Create(filename)
 	if err != nil {
@@ -192,14 +192,14 @@ msgstr "More Translation"
 	`
 
 	// Create Locales directory with simplified language code
-	dirname := path.Join("/tmp", "en", "LC_MESSAGES")
+	dirname := filepath.Join("/tmp", "en", "LC_MESSAGES")
 	err := os.MkdirAll(dirname, os.ModePerm)
 	if err != nil {
 		t.Fatalf("Can't create test directory: %s", err.Error())
 	}
 
 	// Write PO content to file
-	filename := path.Join(dirname, "my_domain.po")
+	filename := filepath.Join(dirname, "my_domain.po")
 
 	f, err := os.Create(filename)
 	if err != nil {
@@ -425,14 +425,14 @@ msgstr[2] "And this is the second plural form: %s"
 	`
 
 	// Create Locales directory with simplified language code
-	dirname := path.Join("/tmp", "es")
+	dirname := filepath.Join("/tmp", "es")
 	err := os.MkdirAll(dirname, os.ModePerm)
 	if err != nil {
 		t.Fatalf("Can't create test directory: %s", err.Error())
 	}
 
 	// Write PO content to file
-	filename := path.Join(dirname, "race.po")
+	filename := filepath.Join(dirname, "race.po")
 
 	f, err := os.Create(filename)
 	if err != nil {

po.go

@@ -456,7 +456,7 @@ func (po *Po) GetNC(str, plural string, n int, ctx string, vars ...interface{})
 	return Printf(plural, vars...)
 }
 
-// Get Eretrieves the corresponding Translation for the given string.
+// GetE retrieves the corresponding Translation for the given string.
 // Supports optional parameters (vars... interface{}) to be inserted on the formatted string using the fmt.Printf syntax.
 // The second return value is true iff the string was found.
 func (po *Po) GetE(str string, vars ...interface{}) (string, bool) {
@@ -475,7 +475,7 @@ func (po *Po) GetE(str string, vars ...interface{}) (string, bool) {
 	return "", false
 }
 
-// GetN Eretrieves the (N)th plural form of Translation for the given string.
+// GetNE retrieves the (N)th plural form of Translation for the given string.
 // Supports optional parameters (vars... interface{}) to be inserted on the formatted string using the fmt.Printf syntax.
 // The second return value is true iff the string was found.
 func (po *Po) GetNE(str, plural string, n int, vars ...interface{}) (string, bool) {

translation.go

@@ -51,7 +51,7 @@ func (t *Translation) GetN(n int) string {
 	return t.PluralID
 }
 
-// Get returns the string of the translation. The second return value is true
+// GetE returns the string of the translation. The second return value is true
 // iff the string was found.
 func (t *Translation) GetE() (string, bool) {
 	// Look for Translation index 0
@@ -64,7 +64,7 @@ func (t *Translation) GetE() (string, bool) {
 	return "", false
 }
 
-// GetN returns the string of the plural translation. The second return value
+// GetNE returns the string of the plural translation. The second return value
 // is true iff the string was found.
 func (t *Translation) GetNE(n int) (string, bool) {
 	// Look for Translation index