Mirrors/asciinema
1
0
Fork 0
mirror of https://github.com/asciinema/asciinema.git synced 2025-12-16 19:58:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Accept LC_CTYPE without country/language codes (fixes #103)

Browse Source
This commit is contained in:
Marcin Kulik
2015-05-25 18:33:41 +02:00
parent e745206ea0
commit 1e2ddf018c
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
util/locale.go
View File

@@ -4,14 +4,29 @@ import "strings"
var usAscii = "US-ASCII" var usAscii = "US-ASCII"
func GetLocaleCharset(env map[string]string) string { func extractCharset(locale, defaultCharset string) string {
locale := FirstNonBlank(env["LC_ALL"], env["LC_CTYPE"], env["LANG"])
parts := strings.Split(locale, ".") parts := strings.Split(locale, ".")
if len(parts) == 2 { if len(parts) == 2 {
return parts[1] return parts[1]
} }
return defaultCharset
}
func GetLocaleCharset(env map[string]string) string {
if env["LC_ALL"] != "" {
return extractCharset(env["LC_ALL"], usAscii)
}
if env["LC_CTYPE"] != "" {
return extractCharset(env["LC_CTYPE"], env["LC_CTYPE"])
}
if env["LANG"] != "" {
return extractCharset(env["LANG"], usAscii)
}
return usAscii return usAscii
} }

2
util/locale_test.go
View File

@@ -19,7 +19,7 @@ func TestGetLocaleCharset(t *testing.T) {
{"", "", "pl_PL.ISO-8859-2", "ISO-8859-2"}, {"", "", "pl_PL.ISO-8859-2", "ISO-8859-2"},
{"", "", "", "US-ASCII"}, {"", "", "", "US-ASCII"},
{"UTF-8", "pl_PL.ISO-8859-1", "pl_PL.ISO-8859-2", "US-ASCII"}, {"UTF-8", "pl_PL.ISO-8859-1", "pl_PL.ISO-8859-2", "US-ASCII"},
{"", "ISO-8859-1", "pl_PL.ISO-8859-2", "US-ASCII"}, {"", "ISO-8859-1", "pl_PL.ISO-8859-2", "ISO-8859-1"},
{"", "", "ISO-8859-2", "US-ASCII"}, {"", "", "ISO-8859-2", "US-ASCII"},
} }