From 373ef5d15e1c2781bf47750554cb21e4ed5446c1 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 11 Sep 2015 12:33:27 -0400 Subject: [PATCH] #1500 timezone minutes offset --- README.md | 2 +- gogs.go | 2 +- models/models.go | 7 ++++--- templates/.VERSION | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a5c05ffec1..a729ae4ae7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra Gogs (Go Git Service) is a painless self-hosted Git service. -##### Current version: 0.6.9 Beta +##### Current version: 0.6.11 Beta diff --git a/gogs.go b/gogs.go index 903e1222d3..650c01367d 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.10.0910 Beta" +const APP_VER = "0.6.11.0911 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/models.go b/models/models.go index 67fa14149e..33459642d5 100644 --- a/models/models.go +++ b/models/models.go @@ -54,12 +54,13 @@ func regulateTimeZone(t time.Time) time.Time { if len(zone) != 5 { return t } - offset := com.StrTo(zone[2:3]).MustInt() + hour := com.StrTo(zone[2:3]).MustInt() + minutes := com.StrTo(zone[3:4]).MustInt() if zone[0] == '-' { - return t.Add(time.Duration(offset) * time.Hour) + return t.Add(time.Duration(hour) * time.Hour).Add(time.Duration(minutes) * time.Minute) } - return t.Add(-1 * time.Duration(offset) * time.Hour) + return t.Add(-1 * time.Duration(hour) * time.Hour).Add(-1 * time.Duration(minutes) * time.Minute) } var ( diff --git a/templates/.VERSION b/templates/.VERSION index af4eaa61b6..793a9cf1f3 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.10.0910 Beta \ No newline at end of file +0.6.11.0911 Beta \ No newline at end of file