Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BUG 2328: wrong calendar seasons.

This commit is contained in:
Enno Rehling 2017-05-26 06:27:25 +02:00
parent 9525c8790c
commit 8e15487a1e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
conf/calendar.json
View File

@ -2,17 +2,18 @@
"calendar" : { "calendar" : {
"months" : [ "months" : [
{ "storm" : 60, "season" : 2 }, { "storm" : 60, "season" : 2 },
{ "storm" : 10, "season" : 2 },
{ "storm" : 60, "season" : 3 },
{ "storm" : 10, "season" : 3 }, { "storm" : 10, "season" : 3 },
{ "storm" : 60, "season" : 3 },
{ "storm" : 10, "season" : 0 },
{ "storm" : 60, "season" : 0 }, { "storm" : 60, "season" : 0 },
{ "storm" : 80, "season" : 0 }, { "storm" : 80, "season" : 0 },
{ "storm" : 50, "season" : 1 }, { "storm" : 50, "season" : 1 },
{ "storm" : 30, "season" : 1 }, { "storm" : 30, "season" : 1 },
{ "storm" : 60, "season" : 1 }
{ "storm" : 60, "season" : 2 }
], ],
"weeks" : [ "weeks" : [
"firstweek", "secondweek", "thirdweek" "firstweek", "secondweek", "thirdweek"

4
scripts/tests/e2/e2features.lua
View File

@ -404,3 +404,7 @@ function test_demonstealth()
desc = u:show() desc = u:show()
assert_equal(nil, string.find(desc, "Drache")) assert_equal(nil, string.find(desc, "Drache"))
end end
function test_calendar_season_2328()
assert_equal("fall", get_season(1026))
end