fix lint errors

nicksnyder · Dec 5, 2023 · f4a6e0a · f4a6e0a
1 parent b07437f
commit f4a6e0a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/v2/i18n/localizer.go b/v2/i18n/localizer.go
@@ -90,15 +90,6 @@ func (e *MessageNotFoundErr) Error() string {
 	return fmt.Sprintf("message %q not found in language %q", e.MessageID, e.Tag)
 }
 
-type pluralizeErr struct {
-	messageID string
-	tag       language.Tag
-}
-
-func (e *pluralizeErr) Error() string {
-	return fmt.Sprintf("unable to pluralize %q because there no plural rule for %q", e.messageID, e.tag)
-}
-
 type messageIDMismatchErr struct {
 	messageID        string
 	defaultMessageID string

diff --git a/v2/internal/plural/codegen/main.go b/v2/internal/plural/codegen/main.go
@@ -127,12 +127,6 @@ func infof(format string, args ...interface{}) {
 
 var verbose bool
 
-func verbosef(format string, args ...interface{}) {
-	if verbose {
-		infof(format, args...)
-	}
-}
-
 func fatalf(format string, args ...interface{}) {
 	infof("fatal: "+format+"\n", args...)
 	os.Exit(1)

diff --git a/v2/internal/plural/codegen/xml.go b/v2/internal/plural/codegen/xml.go
@@ -6,6 +6,9 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 // SupplementalData is the top level struct of plural.xml
@@ -22,7 +25,7 @@ type PluralGroup struct {
 
 // Name returns a unique name for this plural group.
 func (pg *PluralGroup) Name() string {
-	n := strings.Title(pg.Locales)
+	n := cases.Title(language.AmericanEnglish).String(pg.Locales)
 	return strings.Replace(n, " ", "", -1)
 }
 
@@ -39,7 +42,7 @@ type PluralRule struct {
 
 // CountTitle returns the title case of the PluralRule's count.
 func (pr *PluralRule) CountTitle() string {
-	return strings.Title(pr.Count)
+	return cases.Title(language.AmericanEnglish).String(pr.Count)
 }
 
 // Condition returns the condition where the PluralRule applies.
@@ -100,7 +103,8 @@ func (pr *PluralRule) GoCondition() string {
 			if parts == nil {
 				continue
 			}
-			lvar, lmod, op, rhs := strings.Title(parts[1]), parts[2], parts[3], strings.TrimSpace(parts[4])
+			lvar := cases.Title(language.AmericanEnglish).String(parts[1])
+			lmod, op, rhs := parts[2], parts[3], strings.TrimSpace(parts[4])
 			if op == "=" {
 				op = "=="
 			}

diff --git a/v2/internal/plural/rule_gen_test.go b/v2/internal/plural/rule_gen_test.go
@@ -375,7 +375,7 @@ func TestPt(t *testing.T) {
 	}
 }
 
-func TestCaItPt_PTVec(t *testing.T) {
+func TestCaItPt_ptVec(t *testing.T) {
 	var tests []pluralFormTest
 
 	tests = appendIntegerTests(tests, One, []string{"1"})