From b84736e9b6401df0c6eeab9950bef09458a6aefd Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 29 Sep 2017 12:46:30 -0700 Subject: Updating server dependancies. (#7538) --- vendor/golang.org/x/text/language/display/maketables.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'vendor/golang.org/x/text/language/display/maketables.go') 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()) } -- cgit v1.2.3-1-g7c22