Fix IsTranslated* functions using n directly rather than using the nth plural form; fixes #92

Author: sblinch

domain.go

@@ -401,7 +401,7 @@ func (do *Domain) GetNC(str, plural string, n int, ctx string, vars ...interface
 
 // IsTranslated reports whether a string is translated
 func (do *Domain) IsTranslated(str string) bool {
-	return do.IsTranslatedN(str, 0)
+	return do.IsTranslatedN(str, 1)
 }
 
 // IsTranslatedN reports whether a plural string is translated
@@ -416,12 +416,12 @@ func (do *Domain) IsTranslatedN(str string, n int) bool {
 	if !ok {
 		return false
 	}
-	return tr.IsTranslatedN(n)
+	return tr.IsTranslatedN(do.pluralForm(n))
 }
 
 // IsTranslatedC reports whether a context string is translated
 func (do *Domain) IsTranslatedC(str, ctx string) bool {
-	return do.IsTranslatedNC(str, 0, ctx)
+	return do.IsTranslatedNC(str, 1, ctx)
 }
 
 // IsTranslatedNC reports whether a plural context string is translated
@@ -440,7 +440,7 @@ func (do *Domain) IsTranslatedNC(str string, n int, ctx string) bool {
 	if !ok {
 		return false
 	}
-	return tr.IsTranslatedN(n)
+	return tr.IsTranslatedN(do.pluralForm(n))
 }
 
 // GetTranslations returns a copy of every translation in the domain. It does not support contexts.

domain_test.go

@@ -9,7 +9,7 @@ const (
 	arFixture   = "fixtures/ar/categories.po"
 )
 
-//since both Po and Mo just pass-through to Domain for MarshalBinary and UnmarshalBinary, test it here
+// since both Po and Mo just pass-through to Domain for MarshalBinary and UnmarshalBinary, test it here
 func TestBinaryEncoding(t *testing.T) {
 	// Create po objects
 	po := NewPo()
@@ -85,11 +85,11 @@ func TestDomain_IsTranslated(t *testing.T) {
 	if english.IsTranslated("Another string") {
 		t.Error("'Another string' should be reported as not translated.")
 	}
-	if !english.IsTranslatedN("Empty plural form singular", 0) {
-		t.Error("'Empty plural form singular' should be reported as translated for n=0.")
+	if !english.IsTranslatedN("Empty plural form singular", 1) {
+		t.Error("'Empty plural form singular' should be reported as translated for n=1.")
 	}
-	if english.IsTranslatedN("Empty plural form singular", 1) {
-		t.Error("'Empty plural form singular' should be reported as not translated for n=1.")
+	if english.IsTranslatedN("Empty plural form singular", 0) {
+		t.Error("'Empty plural form singular' should be reported as not translated for n=0.")
 	}
 
 	arabicPo := NewPo()
@@ -106,11 +106,8 @@ func TestDomain_IsTranslated(t *testing.T) {
 	if !arabic.IsTranslatedN("Load %d more document", 1) {
 		t.Error("Arabic plural should be reported as translated for n=1.")
 	}
-	if !arabic.IsTranslatedN("Load %d more document", 5) {
-		t.Error("Arabic plural should be reported as translated for n=5.")
-	}
-	if arabic.IsTranslatedN("Load %d more document", 6) {
-		t.Error("Arabic plural should be reported as not translated for n=6.")
+	if !arabic.IsTranslatedN("Load %d more document", 100) {
+		t.Error("Arabic plural should be reported as translated for n=100.")
 	}
 
 	// context
@@ -120,7 +117,7 @@ func TestDomain_IsTranslated(t *testing.T) {
 	if !english.IsTranslatedNC("One with var: %s", 0, "Ctx") {
 		t.Error("Context plural should be reported as translated for n=0")
 	}
-	if english.IsTranslatedNC("One with var: %s", 2, "Ctx") {
+	if !english.IsTranslatedNC("One with var: %s", 2, "Ctx") {
 		t.Error("Context plural should be reported as translated for n=2")
 	}
 }

gotext.go

@@ -3,22 +3,21 @@ Package gotext implements GNU gettext utilities.
 
 For quick/simple translations you can use the package level functions directly.
 
-    import (
-	    "fmt"
-	    "github.com/leonelquinteros/gotext"
-    )
+	    import (
+		    "fmt"
+		    "github.com/leonelquinteros/gotext"
+	    )
 
-    func main() {
-        // Configure package
-        gotext.Configure("/path/to/locales/root/dir", "en_UK", "domain-name")
+	    func main() {
+	        // Configure package
+	        gotext.Configure("/path/to/locales/root/dir", "en_UK", "domain-name")
 
-        // Translate text from default domain
-        fmt.Println(gotext.Get("My text on 'domain-name' domain"))
-
-        // Translate text from a different domain without reconfigure
-        fmt.Println(gotext.GetD("domain2", "Another text on a different domain"))
-    }
+	        // Translate text from default domain
+	        fmt.Println(gotext.Get("My text on 'domain-name' domain"))
 
+	        // Translate text from a different domain without reconfigure
+	        fmt.Println(gotext.GetD("domain2", "Another text on a different domain"))
+	    }
 */
 package gotext
 
@@ -342,7 +341,7 @@ func GetNDC(dom, str, plural string, n int, ctx string, vars ...interface{}) str
 // IsTranslated reports whether a string is translated in given languages.
 // When the langs argument is omitted, the output of GetLanguages is used.
 func IsTranslated(str string, langs ...string) bool {
-	return IsTranslatedND(GetDomain(), str, 0, langs...)
+	return IsTranslatedND(GetDomain(), str, 1, langs...)
 }
 
 // IsTranslatedN reports whether a plural string is translated in given languages.
@@ -354,7 +353,7 @@ func IsTranslatedN(str string, n int, langs ...string) bool {
 // IsTranslatedD reports whether a domain string is translated in given languages.
 // When the langs argument is omitted, the output of GetLanguages is used.
 func IsTranslatedD(dom, str string, langs ...string) bool {
-	return IsTranslatedND(dom, str, 0, langs...)
+	return IsTranslatedND(dom, str, 1, langs...)
 }
 
 // IsTranslatedND reports whether a plural domain string is translated in any of given languages.
@@ -385,7 +384,7 @@ func IsTranslatedND(dom, str string, n int, langs ...string) bool {
 // IsTranslatedC reports whether a context string is translated in given languages.
 // When the langs argument is omitted, the output of GetLanguages is used.
 func IsTranslatedC(str, ctx string, langs ...string) bool {
-	return IsTranslatedNDC(GetDomain(), str, 0, ctx, langs...)
+	return IsTranslatedNDC(GetDomain(), str, 1, ctx, langs...)
 }
 
 // IsTranslatedNC reports whether a plural context string is translated in given languages.