From ec77d051df4e5c6910957e03eba7feda58c00199 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 4 Aug 2023 23:02:55 +0530 Subject: [PATCH] Replace another deprecated function --- go.mod | 1 + go.sum | 2 ++ tools/themes/collection.go | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c2c8ee2fd..d67cc9c57 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b golang.org/x/image v0.10.0 golang.org/x/sys v0.11.0 + golang.org/x/text v0.12.0 howett.net/plist v1.0.0 ) diff --git a/go.sum b/go.sum index f6d4049d8..41188125a 100644 --- a/go.sum +++ b/go.sum @@ -99,6 +99,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/tools/themes/collection.go b/tools/themes/collection.go index 7b0b54341..3560486e4 100644 --- a/tools/themes/collection.go +++ b/tools/themes/collection.go @@ -30,6 +30,8 @@ import ( "golang.org/x/exp/maps" "golang.org/x/exp/slices" "golang.org/x/sys/unix" + "golang.org/x/text/cases" + "golang.org/x/text/language" ) var _ = fmt.Print @@ -788,7 +790,8 @@ func ThemeNameFromFileName(fname string) string { fname = fname[:len(fname)-len(path.Ext(fname))] fname = strings.ReplaceAll(fname, "_", " ") fname = camel_case_pat().ReplaceAllString(fname, "$1 $2") - return strings.Join(utils.Map(strings.Title, strings.Split(fname, " ")), " ") + c := cases.Title(language.English) + return strings.Join(utils.Map(c.String, strings.Split(fname, " ")), " ") } func (self *Themes) Len() int { return len(self.name_map) }