Skip to content
This repository has been archived by the owner on Mar 7, 2023. It is now read-only.

Commit

Permalink
Switch to go modules.
Browse files Browse the repository at this point in the history
  • Loading branch information
icedream committed Oct 2, 2018
1 parent 68fe412 commit 2f5e438
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 36 deletions.
24 changes: 0 additions & 24 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
[submodule "vendor/github.com/alecthomas/kingpin"]
path = vendor/github.com/alecthomas/kingpin
url = https://github.com/alecthomas/kingpin
[submodule "vendor/github.com/alecthomas/template"]
path = vendor/github.com/alecthomas/template
url = https://github.com/alecthomas/template
[submodule "vendor/github.com/alecthomas/units"]
path = vendor/github.com/alecthomas/units
url = https://github.com/alecthomas/units
[submodule "vendor/github.com/ghodss/yaml"]
path = vendor/github.com/ghodss/yaml
url = https://github.com/ghodss/yaml
[submodule "vendor/github.com/jinzhu/now"]
path = vendor/github.com/jinzhu/now
url = https://github.com/jinzhu/now
[submodule "vendor/github.com/nicksnyder/go-i18n"]
path = vendor/github.com/nicksnyder/go-i18n
url = https://github.com/nicksnyder/go-i18n
[submodule "vendor/github.com/shurcooL/sanitized_anchor_name"]
path = vendor/github.com/shurcooL/sanitized_anchor_name
url = https://github.com/shurcooL/sanitized_anchor_name
[submodule "vendor/gopkg.in/yaml.v2"]
path = vendor/gopkg.in/yaml.v2
url = https://gopkg.in/yaml.v2
[submodule "vendor/github.com/russross/blackfriday"]
path = vendor/github.com/russross/blackfriday
url = https://github.com/icedream/blackfriday.git
9 changes: 6 additions & 3 deletions export/latex/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,16 @@ func (e *Exporter) Export(prj *project.Project, w io.Writer) (err error) {
return stringutil.Latexize(originalT(translationID, args...))
}

now.FirstDayMonday = prj.FirstDayMonday
// TODO: Reflect WeekStartDay exactly in project file, too
if prj.FirstDayMonday {
now.WeekStartDay = time.Monday
}

exportTemplate = exportTemplate.Funcs(template.FuncMap{
"T": T,
"beginofweek": func(date project.Date) project.Date {
day := now.New(date.Time).BeginningOfWeek()
if prj.OnlyShowWorkDays && !now.FirstDayMonday {
if prj.OnlyShowWorkDays && now.WeekStartDay != time.Monday {
day = day.Add(time.Hour * 24)
}
return project.Date{Time: day}
Expand All @@ -56,7 +59,7 @@ func (e *Exporter) Export(prj *project.Project, w io.Writer) (err error) {
day := now.New(date.Time).EndOfWeek()
if prj.OnlyShowWorkDays {
day = day.Add(time.Hour * -24)
if now.FirstDayMonday {
if now.WeekStartDay == time.Monday {
day = day.Add(time.Hour * -24)
}
}
Expand Down
19 changes: 19 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module github.com/icedream/workreport-manager

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/alecthomas/kingpin v2.2.6+incompatible
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ghodss/yaml v1.0.0
github.com/jinzhu/now v0.0.0-20180511015916-ed742868f2ae
github.com/nicksnyder/go-i18n v1.10.0
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday v1.5.2
github.com/stretchr/testify v1.2.2
gopkg.in/yaml.v2 v2.2.1 // indirect
)

replace github.com/russross/blackfriday v1.5.2 => ./vendor/github.com/russross/blackfriday
26 changes: 26 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/alecthomas/kingpin v2.2.6+incompatible h1:5svnBTFgJjZvGKyYBtMB0+m5wvrbUHiqye8wRJMlnYI=
github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/jinzhu/now v0.0.0-20180511015916-ed742868f2ae h1:8bBMcboXYVuo0WYH+rPe5mB8obO89a993hdTZ3phTjc=
github.com/jinzhu/now v0.0.0-20180511015916-ed742868f2ae/go.mod h1:oHTiXerJ20+SfYcrdlBO7rzZRJWGwSTQ0iUY2jI6Gfc=
github.com/nicksnyder/go-i18n v1.10.0 h1:5AzlPKvXBH4qBzmZ09Ua9Gipyruv6uApMcrNZdo96+Q=
github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
1 change: 0 additions & 1 deletion vendor/github.com/alecthomas/kingpin
Submodule kingpin deleted from 5a6152
1 change: 0 additions & 1 deletion vendor/github.com/alecthomas/template
Submodule template deleted from a0175e
1 change: 0 additions & 1 deletion vendor/github.com/alecthomas/units
Submodule units deleted from 2efee8
1 change: 0 additions & 1 deletion vendor/github.com/ghodss/yaml
Submodule yaml deleted from 0ca9ea
1 change: 0 additions & 1 deletion vendor/github.com/jinzhu/now
Submodule now deleted from d939ba
1 change: 0 additions & 1 deletion vendor/github.com/nicksnyder/go-i18n
Submodule go-i18n deleted from 3e70a1
2 changes: 1 addition & 1 deletion vendor/github.com/russross/blackfriday
Submodule blackfriday updated 10 files
+3 −16 .travis.yml
+115 −38 README.md
+43 −19 block.go
+76 −16 block_test.go
+1 −0 go.mod
+10 −21 html.go
+52 −22 inline_test.go
+5 −3 latex.go
+12 −2 markdown.go
+44 −14 smartypants.go
1 change: 0 additions & 1 deletion vendor/github.com/shurcooL/sanitized_anchor_name
Submodule sanitized_anchor_name deleted from 541ff5
1 change: 0 additions & 1 deletion vendor/gopkg.in/yaml.v2
Submodule yaml.v2 deleted from cd8b52

0 comments on commit 2f5e438

Please sign in to comment.