diff options
| author | 无闻 <u@gogs.io> | 2015-07-28 14:23:16 +0800 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2015-07-28 14:23:16 +0800 |
| commit | 7d8121b0773c6844cfbe022f0897145cabeea3c1 (patch) | |
| tree | 689353fd8012a041090c003d3307b57e5ca321e7 | |
| parent | 589618c8a53f11395fca3465d8ad936ad46caaf0 (diff) | |
| parent | 53bcf373c1d076dd14db6aff0247ae9dbdc49c77 (diff) | |
| download | gitea-7d8121b0773c6844cfbe022f0897145cabeea3c1.tar.gz gitea-7d8121b0773c6844cfbe022f0897145cabeea3c1.zip | |
Merge pull request #1399 from wqweto/develop
Allow explicit charset/codepage setting for ANSI source files to alle…
| -rw-r--r-- | modules/base/template.go | 3 | ||||
| -rw-r--r-- | modules/setting/setting.go | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/modules/base/template.go b/modules/base/template.go index 1442bf0e84..bc69bb3b37 100644 --- a/modules/base/template.go +++ b/modules/base/template.go @@ -55,6 +55,9 @@ func ShortSha(sha1 string) string { func DetectEncoding(content []byte) (string, error) { detector := chardet.NewTextDetector() result, err := detector.DetectBest(content) + if result.Charset == "ISO-8859-1" { + return setting.AnsiCharset, err + } return result.Charset, err } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 2364c313a5..896e60ad13 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -84,6 +84,7 @@ var ( // Repository settings. RepoRootPath string ScriptType string + AnsiCharset string // UI settings. IssuePagingNum int @@ -312,6 +313,7 @@ func NewConfigContext() { RepoRootPath = path.Clean(RepoRootPath) } ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash") + AnsiCharset = sec.Key("ANSI_CHARSET").MustString("ISO-8859-1") // UI settings. IssuePagingNum = Cfg.Section("ui").Key("ISSUE_PAGING_NUM").MustInt(10) |