diff options
| -rw-r--r-- | custom/conf/app.example.ini | 5 | ||||
| -rw-r--r-- | docs/content/doc/administration/config-cheat-sheet.en-us.md | 1 | ||||
| -rw-r--r-- | modules/setting/time.go | 39 | ||||
| -rw-r--r-- | modules/timeutil/language.go | 33 |
4 files changed, 2 insertions, 76 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 3687e0fbd4..f22d555704 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1899,11 +1899,6 @@ ROUTER = console ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -;; Specifies the format for fully outputted dates. Defaults to RFC1123 -;; Special supported values are ANSIC, UnixDate, RubyDate, RFC822, RFC822Z, RFC850, RFC1123, RFC1123Z, RFC3339, RFC3339Nano, Kitchen, Stamp, StampMilli, StampMicro and StampNano -;; For more information about the format see http://golang.org/pkg/time/#pkg-constants -;FORMAT = -;; ;; Location the UI time display i.e. Asia/Shanghai ;; Empty means server's location setting ;DEFAULT_UI_LOCATION = diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md index 03cd93f91e..f637b1ebd8 100644 --- a/docs/content/doc/administration/config-cheat-sheet.en-us.md +++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md @@ -1207,7 +1207,6 @@ in this mapping or the filetype using heuristics. ## Time (`time`) -- `FORMAT`: Time format to display on UI. i.e. RFC1123 or 2006-01-02 15:04:05 - `DEFAULT_UI_LOCATION`: Default location of time on the UI, so that we can display correct user's time on UI. i.e. Asia/Shanghai ## Task (`task`) diff --git a/modules/setting/time.go b/modules/setting/time.go index 5fd0fdb92f..6d2aa80f5b 100644 --- a/modules/setting/time.go +++ b/modules/setting/time.go @@ -9,45 +9,10 @@ import ( "code.gitea.io/gitea/modules/log" ) -var ( - // Time settings - TimeFormat string - // UILocation is the location on the UI, so that we can display the time on UI. - DefaultUILocation = time.Local -) +// DefaultUILocation is the location on the UI, so that we can display the time on UI. +var DefaultUILocation = time.Local func loadTimeFrom(rootCfg ConfigProvider) { - timeFormatKey := rootCfg.Section("time").Key("FORMAT").MustString("") - if timeFormatKey != "" { - TimeFormat = map[string]string{ - "ANSIC": time.ANSIC, - "UnixDate": time.UnixDate, - "RubyDate": time.RubyDate, - "RFC822": time.RFC822, - "RFC822Z": time.RFC822Z, - "RFC850": time.RFC850, - "RFC1123": time.RFC1123, - "RFC1123Z": time.RFC1123Z, - "RFC3339": time.RFC3339, - "RFC3339Nano": time.RFC3339Nano, - "Kitchen": time.Kitchen, - "Stamp": time.Stamp, - "StampMilli": time.StampMilli, - "StampMicro": time.StampMicro, - "StampNano": time.StampNano, - }[timeFormatKey] - // When the TimeFormatKey does not exist in the previous map e.g.'2006-01-02 15:04:05' - if len(TimeFormat) == 0 { - TimeFormat = timeFormatKey - TestTimeFormat, _ := time.Parse(TimeFormat, TimeFormat) - if TestTimeFormat.Format(time.RFC3339) != "2006-01-02T15:04:05Z" { - log.Warn("Provided TimeFormat: %s does not create a fully specified date and time.", TimeFormat) - log.Warn("In order to display dates and times correctly please check your time format has 2006, 01, 02, 15, 04 and 05") - } - log.Trace("Custom TimeFormat: %s", TimeFormat) - } - } - zone := rootCfg.Section("time").Key("DEFAULT_UI_LOCATION").String() if zone != "" { var err error diff --git a/modules/timeutil/language.go b/modules/timeutil/language.go deleted file mode 100644 index c2f7a0e579..0000000000 --- a/modules/timeutil/language.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2019 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package timeutil - -import ( - "time" - - "code.gitea.io/gitea/modules/setting" -) - -var langTimeFormats = map[string]string{ - "zh-CN": "2006年01月02日 15时04分05秒", - "en-US": time.RFC1123, - "lv-LV": "02.01.2006. 15:04:05", -} - -// GetLangTimeFormat represents the default time format for the language -func GetLangTimeFormat(lang string) string { - return langTimeFormats[lang] -} - -// GetTimeFormat represents the -func GetTimeFormat(lang string) string { - if setting.TimeFormat == "" { - format := GetLangTimeFormat(lang) - if format == "" { - format = time.RFC1123 - } - return format - } - return setting.TimeFormat -} |