Fix handling of artificial languages

This works around what seems to be an upstream by implementing a simplified tag matcher for artificual languages. Fixes nicksnyder#252
bep · Apr 24, 2021 · 7029011 · 7029011
1 parent b3c1841
commit 7029011
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 6 deletions.
diff --git a/v2/go.mod b/v2/go.mod
@@ -7,5 +7,3 @@ require (
 	golang.org/x/text v0.3.3
 	gopkg.in/yaml.v2 v2.3.0
 )
-
-replace golang.org/x/text  => /Users/bep/dev/go/dump/text
diff --git a/v2/i18n/bundle.go b/v2/i18n/bundle.go
@@ -26,9 +26,56 @@ type Bundle struct {
 	matcher          language.Matcher
 }
 
+// The matcher in x/text/language does not handle artificial languages,
+// see https://github.com/golang/go/issues/45749
+// This is a simplified matcher thatdelegates to the x/text/language matcher for
+// the harder cases.
+type matcher struct {
+	tags           []language.Tag
+	defaultMatcher language.Matcher
+}
+
+func newMatcher(tags []language.Tag) language.Matcher {
+	var hasArt bool
+	for _, tag := range tags {
+		base, _ := tag.Base()
+		hasArt = base == artTagBase
+		if hasArt {
+			break
+		}
+	}
+
+	if !hasArt {
+		return language.NewMatcher(tags)
+	}
+
+	return matcher{
+		tags:           tags,
+		defaultMatcher: language.NewMatcher(tags),
+	}
+}
+
+func (m matcher) Match(t ...language.Tag) (language.Tag, int, language.Confidence) {
+	for _, candidate := range t {
+		base, _ := candidate.Base()
+		if base == artTagBase {
+			for i, tag := range m.tags {
+				if tag == candidate {
+					return candidate, i, language.Exact
+				}
+			}
+		}
+	}
+
+	return m.defaultMatcher.Match(t...)
+}
+
 // artTag is the language tag used for artificial languages
 // https://en.wikipedia.org/wiki/Codes_for_constructed_languages
-var artTag = language.MustParse("art")
+var (
+	artTag        = language.MustParse("art")
+	artTagBase, _ = artTag.Base()
+)
 
 // NewBundle returns a bundle with a default language and a default set of plural rules.
 func NewBundle(defaultLanguage language.Tag) *Bundle {
@@ -126,7 +173,7 @@ func (b *Bundle) addTag(tag language.Tag) {
 		}
 	}
 	b.tags = append(b.tags, tag)
-	b.matcher = language.NewMatcher(b.tags)
+	b.matcher = newMatcher(b.tags)
 }
 
 // LanguageTags returns the list of language tags

diff --git a/v2/i18n/bundle_test.go b/v2/i18n/bundle_test.go
@@ -101,7 +101,7 @@ hello = "`+expected+`"
 func TestPseudoLanguages(t *testing.T) {
 	bundle := NewBundle(language.English)
 	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
-	expected := "a3"
+	expected := "a2"
 	bundle.MustParseMessageFileBytes([]byte(`
 hello = "a1"
 `), "art-x-a1.toml")

diff --git a/v2/i18n/localizer.go b/v2/i18n/localizer.go
@@ -171,7 +171,6 @@ func (l *Localizer) LocalizeWithTag(lc *LocalizeConfig) (string, language.Tag, e
 
 func (l *Localizer) getMessageTemplate(id string, defaultMessage *Message) (language.Tag, *MessageTemplate, error) {
 	_, i, _ := l.bundle.matcher.Match(l.tags...)
-	fmt.Println("I", l.tags, l.bundle.tags, i)
 	tag := l.bundle.tags[i]
 	mt := l.bundle.getMessageTemplate(tag, id)
 	if mt != nil {