test/carbon
1
0
Fork 0
mirror of https://gitee.com/dromara/carbon.git synced 2024-12-03 12:48:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize the judgment of the number of optional parameters

Browse Source
This commit is contained in:
gouguoyin 2021-07-31 13:10:20 +08:00
parent 813551e617
commit 719a8e88c5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
carbon.go
View File

@ -156,7 +156,7 @@ func NewCarbon() Carbon {
return Carbon{Loc: time.Local, Lang: NewLanguage()} return Carbon{Loc: time.Local, Lang: NewLanguage()}
} }
// Time2Carbon convert time.Time to Carbon // Time2Carbon convert time.Time into Carbon
// 将 time.Time 转换成 Carbon // 将 time.Time 转换成 Carbon
func Time2Carbon(tt time.Time) Carbon { func Time2Carbon(tt time.Time) Carbon {
c := NewCarbon() c := NewCarbon()
@ -164,7 +164,7 @@ func Time2Carbon(tt time.Time) Carbon {
return c return c
} }
// Carbon2Time convert Carbon to time.Time // Carbon2Time convert Carbon into time.Time
// 将 Carbon 转换成 time.Time // 将 Carbon 转换成 time.Time
func (c Carbon) Carbon2Time() time.Time { func (c Carbon) Carbon2Time() time.Time {
return c.Time.In(c.Loc) return c.Time.In(c.Loc)
@ -173,8 +173,8 @@ func (c Carbon) Carbon2Time() time.Time {
// Now return a Carbon instance for now // Now return a Carbon instance for now
// 当前 // 当前
func (c Carbon) Now(timezone ...string) Carbon { func (c Carbon) Now(timezone ...string) Carbon {
if len(timezone) == 1 { if len(timezone) > 0 {
loc, err := getLocationByTimezone(timezone[0]) loc, err := getLocationByTimezone(timezone[len(timezone)-1])
c.Loc = loc c.Loc = loc
c.Error = err c.Error = err
} }
@ -194,8 +194,8 @@ func Now(timezone ...string) Carbon {
// Tomorrow return a Carbon instance for tomorrow // Tomorrow return a Carbon instance for tomorrow
// 明天 // 明天
func (c Carbon) Tomorrow(timezone ...string) Carbon { func (c Carbon) Tomorrow(timezone ...string) Carbon {
if len(timezone) == 1 { if len(timezone) > 0 {
loc, err := getLocationByTimezone(timezone[0]) loc, err := getLocationByTimezone(timezone[len(timezone)-1])
c.Loc = loc c.Loc = loc
c.Error = err c.Error = err
} }
@ -219,8 +219,8 @@ func Tomorrow(timezone ...string) Carbon {
// Yesterday return a Carbon instance for yesterday // Yesterday return a Carbon instance for yesterday
// 昨天 // 昨天
func (c Carbon) Yesterday(timezone ...string) Carbon { func (c Carbon) Yesterday(timezone ...string) Carbon {
if len(timezone) == 1 { if len(timezone) > 0 {
loc, err := getLocationByTimezone(timezone[0]) loc, err := getLocationByTimezone(timezone[len(timezone)-1])
c.Loc = loc c.Loc = loc
c.Error = err c.Error = err
} }