github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-12 08:16:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated calendar strings to use the CalendarIdentifiers object

Browse source
This commit is contained in:
Stephanie Anderl 2019-02-08 15:33:00 -08:00
parent f8029942d4
commit 1bd4f1870c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcViewModel/Common/DateCalculator.cpp
View file

@ -284,9 +284,9 @@ DateTime DateCalculationEngine::AdjustCalendarDate(Windows::Foundation::DateTime
// It is not guaranteed that adding 1 year will always add 365 days in the Japanese Calendar.
// To work around this quirk, we will change the calendar system to Gregorian before adding 1 year in the Japanese Calendar case only.
// We will then return the calendar system back to the Japanese Calendar.
if (currentCalendarSystem == L"JapaneseCalendar")
if (currentCalendarSystem == CalendarIdentifiers::Japanese)
{
m_calendar->ChangeCalendarSystem(L"GregorianCalendar");
m_calendar->ChangeCalendarSystem(CalendarIdentifiers::Gregorian);
}
m_calendar->AddYears(difference);