commit 158f2d9eafeb8419430c9da5791b8fa57d226975
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 22 00:56:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 22 00:56:54 2018 +0000
tree d25b3c6abb9c181fbf8760c35afdf59c93fa6621
parent 9af53b4795180eb820b891d4fe6b8cecdeb8970a
parent d236e0e4f55505a501311b4a29b15913eeb57aa2

Merge "Add C.utf8 to supported locales"

ui/build/config.go

diff --git a/ui/build/config.go b/ui/build/config.go
index eefe0ed..c171a67 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -293,6 +293,9 @@
 	// for others)
 	if inList("C.UTF-8", locales) {
 		c.environ.Set("LANG", "C.UTF-8")
+	} else if inList("C.utf8", locales) {
+		// These normalize to the same thing
+		c.environ.Set("LANG", "C.UTF-8")
 	} else if inList("en_US.UTF-8", locales) {
 		c.environ.Set("LANG", "en_US.UTF-8")
 	} else if inList("en_US.utf8", locales) {