Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-02-20 02:22:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: default en_US.UTF-8 if lang has problems (#1687)

Browse Source 
Mac's `defaults read -g AppleLocale` command can return locales that
don't have a language in /usr/share/locale. This prevents those locales
from using a language with UTF-8 support. This will use en_US.UTF-8 as a
default to cover those cases if there are problems. As per usual, if
LANG is already set, that value will be used instead.
This commit is contained in:
Sylvie Crowe 2025-01-07 11:47:40 -08:00 committed by GitHub
parent 55f03730bc
commit cee698bbeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/wavebase/wavebase.go
View File

@ -17,6 +17,8 @@ import (
"strings"
"sync"
"time"
"github.com/wavetermdev/waveterm/pkg/util/utilfn"
)
// set by main-server.go
@ -199,28 +201,41 @@ func TryMkdirs(dirName string, perm os.FileMode, dirDesc string) error {
return nil
}
func listValidLangs(ctx context.Context) []string {
out, err := exec.CommandContext(ctx, "locale", "-a").CombinedOutput()
if err != nil {
log.Printf("error running 'locale -a': %s\n", err)
return []string{}
}
// don't bother with CRLF line endings
// this command doesn't work on windows
return strings.Split(string(out), "\n")
}
var osLangOnce = &sync.Once{}
var osLang string
func determineLang() string {
defaultLang := "en_US.UTF-8"
ctx, cancelFn := context.WithTimeout(context.Background(), 2*time.Second)
defer cancelFn()
if runtime.GOOS == "darwin" {
out, err := exec.CommandContext(ctx, "defaults", "read", "-g", "AppleLocale").CombinedOutput()
if err != nil {
log.Printf("error executing 'defaults read -g AppleLocale': %v\n", err)
return ""
log.Printf("error executing 'defaults read -g AppleLocale', will use default 'en_US.UTF-8': %v\n", err)
return defaultLang
}
strOut := string(out)
truncOut := strings.Split(strOut, "@")[0]
return strings.TrimSpace(truncOut) + ".UTF-8"
} else if runtime.GOOS == "win32" {
out, err := exec.CommandContext(ctx, "Get-Culture", "|", "select", "-exp", "Name").CombinedOutput()
if err != nil {
log.Printf("error executing 'Get-Culture | select -exp Name': %v\n", err)
return ""
preferredLang := strings.TrimSpace(truncOut) + ".UTF-8"
validLangs := listValidLangs(ctx)
if !utilfn.ContainsStr(validLangs, preferredLang) {
log.Printf("unable to use desired lang %s, will use default 'en_US.UTF-8'\n", preferredLang)
return defaultLang
}
return strings.TrimSpace(string(out)) + ".UTF-8"
return preferredLang
} else {
// this is specifically to get the wavesrv LANG so waveshell
// on a remote uses the same LANG