Browse Source
Allow explicit charset/codepage setting for ANSI source files to alleviate issue #1088
tags/v1.2.0-rc1
Vladimir Vissoultchev
10 years ago
2 changed files with 5 additions and 0 deletions
Unified View
Diff Options
-
+3 -0modules/base/template.go
-
+2 -0modules/setting/setting.go
+ 3
- 0
modules/base/template.go
View File
| @@ -55,6 +55,9 @@ func ShortSha(sha1 string) string { | |||||
| func DetectEncoding(content []byte) (string, error) { | func DetectEncoding(content []byte) (string, error) { | ||||
| detector := chardet.NewTextDetector() | detector := chardet.NewTextDetector() | ||||
| result, err := detector.DetectBest(content) | result, err := detector.DetectBest(content) | ||||
| if result.Charset == "ISO-8859-1" { | |||||
| return setting.AnsiCharset, err | |||||
| } | |||||
| return result.Charset, err | return result.Charset, err | ||||
| } | } | ||||
+ 2
- 0
modules/setting/setting.go
View File
| @@ -84,6 +84,7 @@ var ( | |||||
| // Repository settings. | // Repository settings. | ||||
| RepoRootPath string | RepoRootPath string | ||||
| ScriptType string | ScriptType string | ||||
| AnsiCharset string | |||||
| // UI settings. | // UI settings. | ||||
| IssuePagingNum int | IssuePagingNum int | ||||
| @@ -312,6 +313,7 @@ func NewConfigContext() { | |||||
| RepoRootPath = path.Clean(RepoRootPath) | RepoRootPath = path.Clean(RepoRootPath) | ||||
| } | } | ||||
| ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash") | ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash") | ||||
| AnsiCharset = sec.Key("ANSI_CHARSET").MustString("ISO-8859-1") | |||||
| // UI settings. | // UI settings. | ||||
| IssuePagingNum = Cfg.Section("ui").Key("ISSUE_PAGING_NUM").MustInt(10) | IssuePagingNum = Cfg.Section("ui").Key("ISSUE_PAGING_NUM").MustInt(10) | ||||