Fix tests

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

modules/charset/escape_test.go

@@ -133,11 +133,18 @@ then resh (ר), and finally heh (ה) (which should appear leftmost).`,
 	},
 }
 
+type nullLocale struct{}
+
+func (nullLocale) Language() string                                                   { return "" }
+func (nullLocale) Tr(key string, _ ...interface{}) string                             { return key }
+func (nullLocale) TrN(cnt interface{}, key1, keyN string, args ...interface{}) string { return "" }
+
+var _ (translation.Locale) = nullLocale{}
+
 func TestEscapeControlString(t *testing.T) {
 	for _, tt := range escapeControlTests {
 		t.Run(tt.name, func(t *testing.T) {
-			locale := translation.NewLocale("en_US")
-			status, result := EscapeControlString(tt.text, locale)
+			status, result := EscapeControlString(tt.text, nullLocale{})
 			if !reflect.DeepEqual(*status, tt.status) {
 				t.Errorf("EscapeControlString() status = %v, wanted= %v", status, tt.status)
 			}
@@ -173,7 +180,7 @@ func TestEscapeControlReader(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			input := strings.NewReader(tt.text)
 			output := &strings.Builder{}
-			status, err := EscapeControlReader(input, output, translation.NewLocale("en_US"))
+			status, err := EscapeControlReader(input, output, nullLocale{})
 			result := output.String()
 			if err != nil {
 				t.Errorf("EscapeControlReader(): err = %v", err)
@@ -195,5 +202,5 @@ func TestEscapeControlReader_panic(t *testing.T) {
 	for i := 0; i < 6826; i++ {
 		bs = append(bs, []byte("—")...)
 	}
-	_, _ = EscapeControlString(string(bs), translation.NewLocale("en_US"))
+	_, _ = EscapeControlString(string(bs), nullLocale{})
 }

modules/translation/i18n/localestore.go

@@ -98,27 +98,26 @@ func (store *localeStore) SetDefaultLang(lang string) {
 func (store *localeStore) Tr(lang, trKey string, trArgs ...interface{}) string {
 	l, _ := store.Locale(lang)
 
-	if l != nil {
-		return l.Tr(trKey, trArgs...)
-	}
-	return trKey
+	return l.Tr(trKey, trArgs...)
 }
 
 // Has returns whether the given language has a translation for the provided key
 func (store *localeStore) Has(lang, trKey string) bool {
 	l, _ := store.Locale(lang)
 
-	if l != nil {
-		return false
-	}
 	return l.Has(trKey)
 }
 
 // Locale returns the locale for the lang or the default language
-func (store *localeStore) Locale(lang string) (l Locale, found bool) {
-	l, found = store.localeMap[lang]
+func (store *localeStore) Locale(lang string) (Locale, bool) {
+	l, found := store.localeMap[lang]
 	if !found {
-		l = store.localeMap[store.defaultLang]
+		var ok bool
+		l, ok = store.localeMap[store.defaultLang]
+		if !ok {
+			// no default - return an empty locale
+			l = &locale{store: store, idxToMsgMap: make(map[int]string)}
+		}
 	}
 	return l, found
 }