#96926# Holiday in CS moved from 8.5 to 8.3
This commit is contained in:
Behrend Cornelius
parent
20229c7c83
commit
e76b716cc4
1 changed files with 13 additions and 13 deletions
|
|
@ -149,7 +149,7 @@ End Sub
|
|||
Sub FindWholeYearHolidays_PORT(ByVal YearInt as Integer)
|
||||
Dim lDate&
|
||||
CalInsertBankholiday(DateSerial(YearInt, 1, 1), "Ano Novo", cHolidayType_Full)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 1, 6), "Reis Magos", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 1, 6), "Reis Magos", cHolidayType_Half)
|
||||
lDate = CalEasterTable(YearInt)
|
||||
CalInsertBankholiday(lDate-47, "Carnaval", cHolidayType_Full)
|
||||
CalInsertBankholiday(lDate-7, "Domingo de Ramos", cHolidayType_Half)
|
||||
|
|
@ -207,7 +207,7 @@ Sub FindWholeYearHolidays_PL (ByVal YearInt as Integer)
|
|||
CalInsertBankholiday(OsternDate+39, "Wniebowst¹pienie", cHolidayType_Full)
|
||||
' Pfingsten
|
||||
CalInsertBankholiday(OsternDate+49, "Zielone Œwi¹tki", cHolidayType_Full)
|
||||
' Fronleichnam
|
||||
' Fronleichnam
|
||||
CalInsertBankholiday(OsternDate+60, "Bo¿e Cia³o", cHolidayType_Full)
|
||||
' First of May
|
||||
CalInsertBankholiday(DateSerial(YearInt, 5, 1), "Œwiêto pracy", cHolidayType_Full)
|
||||
|
|
@ -286,7 +286,7 @@ Dim lElectDate as Long
|
|||
CalInsertBankholiday(DateSerial(YearInt, 12, 24), "Christmas Eve", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 25), "Christmas Day", cHolidayType_Full)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 31), "New Year's Eve", cHolidayType_Half)
|
||||
|
||||
|
||||
CalInsertBankholiday(CalEasterTable(YearInt), "Easter Sunday", cHolidayType_Half)
|
||||
|
||||
' Inauguration Day occurs every 4 years (1997, 2001) in the year following the presidential election
|
||||
|
|
@ -306,15 +306,15 @@ Dim lElectDate as Long
|
|||
If lElectDate > lFirstNov Then
|
||||
CalInsertBankholiday(lElectDate, "Election Day", cHolidayType_Half)
|
||||
Else
|
||||
CalInsertBankholiday(lElectDate + 7, "Election Day", cHolidayType_Half)
|
||||
CalInsertBankholiday(lElectDate + 7, "Election Day", cHolidayType_Half)
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 1, 2, 14), "Martin Luther King Jr Day", cHolidayType_Full)
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 2, 2, 14), "President's Day", cHolidayType_Full)
|
||||
' Mothers Day : 2nd Sunday in May, Full
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 5,1,7), "Mother's Day", cHolidayType_Full)
|
||||
|
||||
' Wednesday of the last full week of April Administrative Professionals' Day (formerly Secretaries' Day)
|
||||
' Wednesday of the last full week of April Administrative Professionals' Day (formerly Secretaries' Day)
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 5, 7, -7)-3, "Administrative Professionals' Day", cHolidayType_Half)
|
||||
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 5, 5, 0), "National Day of Prayer", cHolidayType_Half)
|
||||
|
|
@ -329,7 +329,7 @@ Dim lElectDate as Long
|
|||
|
||||
' 1st Monday in Sep : Labor Day, Full
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 9, 2, 0), "Labor Day", cHolidayType_Full)
|
||||
' Sunday after Labor Day Grandparents' Day
|
||||
' Sunday after Labor Day Grandparents' Day
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 9, 2, 0)+6, "Grandparents' Day", cHolidayType_Half)
|
||||
|
||||
CalInsertBankholiday(GetMonthDate(YearInt, 10, 1, 0), "National Children's Day", cHolidayType_Half)
|
||||
|
|
@ -381,10 +381,10 @@ Sub FindWholeYearHolidays_TW(YearInt as Integer)
|
|||
CalInsertBankholiday(DateSerial(YearInt, 9, 21), "中秋節", cHolidayType_Full)
|
||||
CalInsertBankholiday(GetNextWeekDay(YearInt, 9, 28, 2), "孔子誕辰紀念日（教師節）", cHolidayType_Full) ' Just like Columnbusday
|
||||
CalInsertBankholiday(DateSerial(YearInt, 10, 10), "國慶日", cHolidayType_Full)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 10, 25), "臺灣光復節", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 10, 31), "先總統 蔣公誕辰紀念日", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 11), "國父誕辰紀念日（中華文化復興節）", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 25), "行憲紀念日", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 10, 25), "臺灣光復節", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 10, 31), "先總統 蔣公誕辰紀念日", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 11), "國父誕辰紀念日（中華文化復興節）", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 25), "行憲紀念日", cHolidayType_Half)
|
||||
End Sub
|
||||
|
||||
|
||||
|
|
@ -404,7 +404,7 @@ End Function
|
|||
Sub FindWholeYearHolidays_CN(YearInt as Integer)
|
||||
CalculateChineseNewYear(YearInt)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 1, 1), "元旦", cHolidayType_Full) ' New Year
|
||||
CalInsertBankholiday(DateSerial(YearInt, 5, 8), "妇女节", cHolidayType_Half) ' Women's Day
|
||||
CalInsertBankholiday(DateSerial(YearInt, 3, 8), "妇女节", cHolidayType_Half) ' Women's Day
|
||||
CalInsertBankholiday(DateSerial(YearInt, 4, 5), "清明节", cHolidayType_Half) ' Day of the deads
|
||||
CalInsertBankholiday(DateSerial(YearInt, 5, 1), "劳动节", cHolidayType_Full) ' International Labour Day
|
||||
CalInsertBankholiday(DateSerial(YearInt, 6, 1), "儿童节", cHolidayType_Half) ' Children's Day
|
||||
|
|
@ -499,4 +499,4 @@ Function CalculateJapaneseAutumnDay(iSelYear as Integer)
|
|||
If (iSelYear > 1979) And (iSelYear < 2100) Then
|
||||
CalculateJapaneseAutumnDay() = Int(23.8431 + 0.242194)* (iSelYear-1980) - (Int((iSelYear-1980)/4))
|
||||
End If
|
||||
End Function</script:module>
|
||||
End Function</script:module>
|
||||
|
|
|
|||
Loading…
Reference in a new issue