Export fields in MessageNotFoundErr (#306) (#307)

nicksnyder · Nov 18, 2023 · 025ca0c · 025ca0c
1 parent 54617ef
commit 025ca0c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/v2/i18n/localizer.go b/v2/i18n/localizer.go
@@ -82,12 +82,12 @@ func (e *invalidPluralCountErr) Error() string {
 
 // MessageNotFoundErr is returned from Localize when a message could not be found.
 type MessageNotFoundErr struct {
-	tag       language.Tag
-	messageID string
+	Tag       language.Tag
+	MessageID string
 }
 
 func (e *MessageNotFoundErr) Error() string {
-	return fmt.Sprintf("message %q not found in language %q", e.messageID, e.tag)
+	return fmt.Sprintf("message %q not found in language %q", e.MessageID, e.Tag)
 }
 
 type pluralizeErr struct {
@@ -188,26 +188,26 @@ func (l *Localizer) getMessageTemplate(id string, defaultMessage *Message) (lang
 
 	if tag == l.bundle.defaultLanguage {
 		if defaultMessage == nil {
-			return language.Und, nil, &MessageNotFoundErr{tag: tag, messageID: id}
+			return language.Und, nil, &MessageNotFoundErr{Tag: tag, MessageID: id}
 		}
 		mt := NewMessageTemplate(defaultMessage)
 		if mt == nil {
-			return language.Und, nil, &MessageNotFoundErr{tag: tag, messageID: id}
+			return language.Und, nil, &MessageNotFoundErr{Tag: tag, MessageID: id}
 		}
 		return tag, mt, nil
 	}
 
 	// Fallback to default language in bundle.
 	mt = l.bundle.getMessageTemplate(l.bundle.defaultLanguage, id)
 	if mt != nil {
-		return l.bundle.defaultLanguage, mt, &MessageNotFoundErr{tag: tag, messageID: id}
+		return l.bundle.defaultLanguage, mt, &MessageNotFoundErr{Tag: tag, MessageID: id}
 	}
 
 	// Fallback to default message.
 	if defaultMessage == nil {
-		return language.Und, nil, &MessageNotFoundErr{tag: tag, messageID: id}
+		return language.Und, nil, &MessageNotFoundErr{Tag: tag, MessageID: id}
 	}
-	return l.bundle.defaultLanguage, NewMessageTemplate(defaultMessage), &MessageNotFoundErr{tag: tag, messageID: id}
+	return l.bundle.defaultLanguage, NewMessageTemplate(defaultMessage), &MessageNotFoundErr{Tag: tag, MessageID: id}
 }
 
 func (l *Localizer) pluralForm(tag language.Tag, operands *plural.Operands) plural.Form {

diff --git a/v2/i18n/localizer_test.go b/v2/i18n/localizer_test.go
@@ -53,7 +53,7 @@ func localizerTests() []localizerTest {
 			defaultLanguage:   language.English,
 			acceptLangs:       []string{"en"},
 			conf:              &LocalizeConfig{MessageID: "HelloWorld"},
-			expectedErr:       &MessageNotFoundErr{tag: language.English, messageID: "HelloWorld"},
+			expectedErr:       &MessageNotFoundErr{Tag: language.English, MessageID: "HelloWorld"},
 			expectedLocalized: "",
 		},
 		{
@@ -65,7 +65,7 @@ func localizerTests() []localizerTest {
 			},
 			acceptLangs:       []string{"es"},
 			conf:              &LocalizeConfig{MessageID: "HelloWorld"},
-			expectedErr:       &MessageNotFoundErr{tag: language.Spanish, messageID: "HelloWorld"},
+			expectedErr:       &MessageNotFoundErr{Tag: language.Spanish, MessageID: "HelloWorld"},
 			expectedLocalized: "Hello World!",
 		},
 		{
@@ -76,15 +76,15 @@ func localizerTests() []localizerTest {
 			},
 			acceptLangs:       []string{"en"},
 			conf:              &LocalizeConfig{MessageID: "HelloWorld"},
-			expectedErr:       &MessageNotFoundErr{tag: language.English, messageID: "HelloWorld"},
+			expectedErr:       &MessageNotFoundErr{Tag: language.English, MessageID: "HelloWorld"},
 			expectedLocalized: "",
 		},
 		{
 			name:              "missing translations from not default language",
 			defaultLanguage:   language.English,
 			acceptLangs:       []string{"es"},
 			conf:              &LocalizeConfig{MessageID: "HelloWorld"},
-			expectedErr:       &MessageNotFoundErr{tag: language.English, messageID: "HelloWorld"},
+			expectedErr:       &MessageNotFoundErr{Tag: language.English, MessageID: "HelloWorld"},
 			expectedLocalized: "",
 		},
 		{
@@ -95,7 +95,7 @@ func localizerTests() []localizerTest {
 			},
 			acceptLangs:       []string{"es"},
 			conf:              &LocalizeConfig{MessageID: "HelloWorld"},
-			expectedErr:       &MessageNotFoundErr{tag: language.Spanish, messageID: "HelloWorld"},
+			expectedErr:       &MessageNotFoundErr{Tag: language.Spanish, MessageID: "HelloWorld"},
 			expectedLocalized: "",
 		},
 		{
@@ -107,7 +107,7 @@ func localizerTests() []localizerTest {
 			},
 			acceptLangs:       []string{"es"},
 			conf:              &LocalizeConfig{MessageID: "HelloWorld"},
-			expectedErr:       &MessageNotFoundErr{tag: language.Spanish, messageID: "HelloWorld"},
+			expectedErr:       &MessageNotFoundErr{Tag: language.Spanish, MessageID: "HelloWorld"},
 			expectedLocalized: "",
 		},
 		{
@@ -533,7 +533,7 @@ func localizerTests() []localizerTest {
 			conf: &LocalizeConfig{
 				MessageID: "Hello",
 			},
-			expectedErr: &MessageNotFoundErr{tag: language.AmericanEnglish, messageID: "Hello"},
+			expectedErr: &MessageNotFoundErr{Tag: language.AmericanEnglish, MessageID: "Hello"},
 		},
 		{
 			name:            "fallback default message",
@@ -556,7 +556,7 @@ func localizerTests() []localizerTest {
 				},
 			},
 			expectedLocalized: "Hola!",
-			expectedErr:       &MessageNotFoundErr{tag: language.AmericanEnglish, messageID: "Hello"},
+			expectedErr:       &MessageNotFoundErr{Tag: language.AmericanEnglish, MessageID: "Hello"},
 		},
 		{
 			name:            "no fallback default message",
@@ -575,7 +575,7 @@ func localizerTests() []localizerTest {
 			conf: &LocalizeConfig{
 				MessageID: "Hello",
 			},
-			expectedErr: &MessageNotFoundErr{tag: language.AmericanEnglish, messageID: "Hello"},
+			expectedErr: &MessageNotFoundErr{Tag: language.AmericanEnglish, MessageID: "Hello"},
 		},
 		{
 			name:            "empty default message",
@@ -584,7 +584,7 @@ func localizerTests() []localizerTest {
 			conf: &LocalizeConfig{
 				DefaultMessage: &Message{},
 			},
-			expectedErr: &MessageNotFoundErr{tag: language.English, messageID: ""},
+			expectedErr: &MessageNotFoundErr{Tag: language.English, MessageID: ""},
 		},
 		{
 			name:            "empty default message with id",
@@ -595,7 +595,7 @@ func localizerTests() []localizerTest {
 					ID: "Hello",
 				},
 			},
-			expectedErr: &MessageNotFoundErr{tag: language.English, messageID: "Hello"},
+			expectedErr: &MessageNotFoundErr{Tag: language.English, MessageID: "Hello"},
 		},
 	}
 }
@@ -652,7 +652,7 @@ func BenchmarkLocalizer_Localize(b *testing.B) {
 }
 
 func TestMessageNotFoundError(t *testing.T) {
-	actual := (&MessageNotFoundErr{tag: language.AmericanEnglish, messageID: "hello"}).Error()
+	actual := (&MessageNotFoundErr{Tag: language.AmericanEnglish, MessageID: "hello"}).Error()
 	expected := `message "hello" not found in language "en-US"`
 	if actual != expected {
 		t.Fatalf("expected %q; got %q", expected, actual)