summaryrefslogtreecommitdiffstats
path: root/vendor/golang.org/x/text/language/display/maketables.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/golang.org/x/text/language/display/maketables.go')
-rw-r--r--vendor/golang.org/x/text/language/display/maketables.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/vendor/golang.org/x/text/language/display/maketables.go b/vendor/golang.org/x/text/language/display/maketables.go
index 3fcd9c87d..8f2fd076b 100644
--- a/vendor/golang.org/x/text/language/display/maketables.go
+++ b/vendor/golang.org/x/text/language/display/maketables.go
@@ -205,7 +205,13 @@ func (b *builder) generate() {
b.setData("lang", func(g *group, loc language.Tag, ldn *cldr.LocaleDisplayNames) {
if ldn.Languages != nil {
for _, v := range ldn.Languages.Language {
- tag := tagForm.MustParse(v.Type)
+ lang := v.Type
+ if lang == "root" {
+ // We prefer the data from "und"
+ // TODO: allow both the data for root and und somehow.
+ continue
+ }
+ tag := tagForm.MustParse(lang)
if tags.contains(tag) {
g.set(loc, tag.String(), v.Data())
}