lib/when_exe/region/world.rb in when_exe-0.3.7 vs lib/when_exe/region/world.rb in when_exe-0.3.8
- old
+ new
@@ -44,18 +44,18 @@
# 日の暦注 ----------------------------
[When::BasicTypes::M17n,
"names:[day]",
[When::BasicTypes::M17n,
"names:[Week]",
- [DayOfWeek, "label:[Sunday, 日曜日]", {'delta'=>7}],
- [DayOfWeek, "label:[Monday, 月曜日]", {'delta'=>7}],
- [DayOfWeek, "label:[Tuesday, 火曜日]", {'delta'=>7}],
- [DayOfWeek, "label:[Wednesday, 水曜日]", {'delta'=>7}],
- [DayOfWeek, "label:[Thursday, 木曜日]", {'delta'=>7}],
- [DayOfWeek, "label:[Friday, 金曜日]", {'delta'=>7}],
- [DayOfWeek, "label:[Saturday, 土曜日]", {'delta'=>7}],
- [DayOfWeek, "label:[Worldsday, 週外日]", {'delta'=>183}],
+ [DayOfWeek, "label:[Sunday, 日曜日, /date/day_names/0]", {'delta'=>7}],
+ [DayOfWeek, "label:[Monday, 月曜日, /date/day_names/1]", {'delta'=>7}],
+ [DayOfWeek, "label:[Tuesday, 火曜日, /date/day_names/2]", {'delta'=>7}],
+ [DayOfWeek, "label:[Wednesday, 水曜日, /date/day_names/3]", {'delta'=>7}],
+ [DayOfWeek, "label:[Thursday, 木曜日, /date/day_names/4]", {'delta'=>7}],
+ [DayOfWeek, "label:[Friday, 金曜日, /date/day_names/5]", {'delta'=>7}],
+ [DayOfWeek, "label:[Saturday, 土曜日, /date/day_names/6]", {'delta'=>7}],
+ [DayOfWeek, "label:[Worldsday=, 週外日=]", {'delta'=>366}],
],
"[Common_Week]"
]
]]
@@ -157,16 +157,12 @@
module CalendarTypes
#
# World calendar based on Gregorian calendar
#
- World = [CyclicTableBased, {
+ World = [YearLengthTableBased, {
'label' => 'World::World',
- 'origin_of_LSC' => 1721060,
'rule_table' => {
- 'T' => {'Rule' =>['LC', 'SC', 'SC', 'SC']},
- 'SC' => {'Rule' =>[365]*4 + [366, 365, 365, 365]*24},
- 'LC' => {'Rule' =>[366, 365, 365, 365]*25},
365 => {'Length'=>[31,30,30]*3 + [31,30,31]},
366 => {'Length'=>[31,30,30,31,30,31] *2}
},
'note' => 'WorldWeek'
}]