Skip to content

Fix Nepali date widget bug #1492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avazirna merged 8 commits into from
Jul 25, 2025
Merged

Fix Nepali date widget bug #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9319b57
Make calculation DST-aware
avazirna Jun 27, 2025
310468d
Fix timezone offset calculation using Gregorian calendar
avazirna Jun 27, 2025
4c56611
Update the length of the Nepali months
avazirna Jul 14, 2025
51b01bc
Add test to demonstrate that widget works well with a timezone provider
shubham1g5 Oct 5, 2024
dcf459c
Refactor
avazirna Jul 15, 2025
e831bea
Reset TZ provider post unit testing
avazirna Jul 15, 2025
334a900
Update tests to account for DST
avazirna Jul 23, 2025
5bc66ec
Revert "Fix timezone offset calculation using Gregorian calendar"
avazirna Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/main/java/org/javarosa/xform/util/CalendarUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public static String ConvertToEthiopian(Date d, String format) {
/*
* Nepali calendar system has no discernible cyclic month pattern, so we must manually
* enter them here as new calendars are known.
* Calendar source: https://nepalipatro.com.np/calendar
*
* TODO: Enter month lengths for years beyond 2090
*/
Expand Down Expand Up @@ -176,16 +177,16 @@ public static String ConvertToEthiopian(Date d, String format) {
NEPALI_YEAR_MONTHS.put(2078, new int[]{0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30});
NEPALI_YEAR_MONTHS.put(2079, new int[]{0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30});
NEPALI_YEAR_MONTHS.put(2080, new int[]{0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30});
NEPALI_YEAR_MONTHS.put(2081, new int[]{0, 31, 31, 32, 32, 31, 30, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2082, new int[]{0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2083, new int[]{0, 31, 31, 32, 31, 31, 30, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2084, new int[]{0, 31, 31, 32, 31, 31, 30, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2085, new int[]{0, 31, 32, 31, 32, 30, 31, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2086, new int[]{0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2087, new int[]{0, 31, 31, 32, 31, 31, 31, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2088, new int[]{0, 30, 31, 32, 32, 30, 31, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2089, new int[]{0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2090, new int[]{0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 30, 30});
NEPALI_YEAR_MONTHS.put(2081, new int[]{0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31});
NEPALI_YEAR_MONTHS.put(2082, new int[]{0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30});
NEPALI_YEAR_MONTHS.put(2083, new int[]{0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30});
NEPALI_YEAR_MONTHS.put(2084, new int[]{0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31});
NEPALI_YEAR_MONTHS.put(2085, new int[]{0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31});
NEPALI_YEAR_MONTHS.put(2086, new int[]{0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30});
NEPALI_YEAR_MONTHS.put(2087, new int[]{0, 31, 31, 32, 32, 31, 31, 30, 29, 30, 29, 30, 30});
NEPALI_YEAR_MONTHS.put(2088, new int[]{0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31});
NEPALI_YEAR_MONTHS.put(2089, new int[]{0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31});
NEPALI_YEAR_MONTHS.put(2090, new int[]{0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30});
}

private static final int MAX_YEAR = 2090;
Expand Down Expand Up @@ -354,7 +355,7 @@ public static UniversalDate fromMillis(Date date, String timezone) {
cd.setTimeZone(DateUtils.timezone());
}
long dateInMillis = cd.getTime().getTime();
DateTimeZone timezoneObject = DateTimeZone.forOffsetMillis(cd.getTimeZone().getRawOffset());
DateTimeZone timezoneObject = DateTimeZone.forTimeZone(cd.getTimeZone());
return fromMillis(dateInMillis, timezoneObject);
}

Expand Down
72 changes: 69 additions & 3 deletions src/test/java/org/javarosa/xform/util/test/CalendarTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
package org.javarosa.xform.util.test;

import org.javarosa.core.model.utils.DateUtils;
import org.javarosa.core.model.utils.TimezoneProvider;
import org.javarosa.core.services.locale.Localization;
import org.javarosa.core.services.locale.TableLocaleSource;
import org.javarosa.xform.util.CalendarUtils;
import org.javarosa.xform.util.UniversalDate;
import org.joda.time.DateTimeZone;
import org.junit.Before;
import org.junit.Test;

import java.util.Calendar;
Expand All @@ -15,6 +20,19 @@
* @author Phillip Mates (pmates@dimagi.com)
*/
public class CalendarTests {

@Before
public void configureLocaleForCalendar() {
Localization.getGlobalLocalizerAdvanced().addAvailableLocale("default");
Localization.setLocale("default");
TableLocaleSource localeData = new TableLocaleSource();
localeData.setLocaleMapping("ethiopian_months",
"Mäskäräm,T’ïk’ïmt,Hïdar,Tahsas,T’ïr,Yäkatit,Mägabit,Miyaziya,Gïnbot,Säne,Hämle,Nähäse,P’agume");
localeData.setLocaleMapping("nepali_months",
"Baishakh,Jestha,Ashadh,Shrawan,Bhadra,Ashwin,Kartik,Mangsir,Poush,Magh,Falgun,Chaitra");
Localization.getGlobalLocalizerAdvanced().registerLocaleResource("default", localeData);
}

@Test
public void testTimesFallOnSameDate() {
DateTimeZone nepaliTimeZone = DateTimeZone.forTimeZone(TimeZone.getTimeZone("GMT+05:45"));
Expand All @@ -25,8 +43,10 @@ public void testTimesFallOnSameDate() {
Calendar nepaliBeginningOfDayDate = Calendar.getInstance(nepaliTimeZone.toTimeZone());
nepaliBeginningOfDayDate.set(2007, Calendar.JULY, 7, 0, 0);

UniversalDate middleOfDay = CalendarUtils.fromMillis(nepaliMiddleOfDayDate.getTimeInMillis(), nepaliTimeZone);
UniversalDate beginningOfDay = CalendarUtils.fromMillis(nepaliBeginningOfDayDate.getTimeInMillis(), nepaliTimeZone);
UniversalDate middleOfDay = CalendarUtils.fromMillis(nepaliMiddleOfDayDate.getTimeInMillis(),
nepaliTimeZone);
UniversalDate beginningOfDay = CalendarUtils.fromMillis(nepaliBeginningOfDayDate.getTimeInMillis(),
nepaliTimeZone);
assertSameDate(middleOfDay, beginningOfDay);

Calendar nepaliEndOfDayDate = Calendar.getInstance(nepaliTimeZone.toTimeZone());
Expand All @@ -35,6 +55,33 @@ public void testTimesFallOnSameDate() {
assertSameDate(endOfDay, beginningOfDay);
}

// millis <=> date is different in every timezone
@Test
public void testConvertToNepaliString() {
Copy link
Copy Markdown
Contributor

@shubham1g5 shubham1g5 Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you confirm these tests are failing without the changes made in CalendarUtils (I tried on my end but it seems to pass) ? I think we want to confirm that this test indeed reproduces the error we are trying to fix.

Copy link
Copy Markdown
Contributor Author

@avazirna avazirna Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shubham1g5 the tests were considering the raw offset, which doesn't account for DST. I have updated them 334a900. Can you test this again?

MockTimeZoneProvider mockTimeZoneProvider = new MockTimeZoneProvider(TimeZone.getTimeZone("Europe/Madrid"));
DateUtils.setTimezoneProvider(mockTimeZoneProvider);
DateTimeZone timeZone = DateTimeZone.forTimeZone(mockTimeZoneProvider.timeZone);
// this is what Nepali widget uses to calculate the millis from date fields
long millis = CalendarUtils.toMillisFromJavaEpoch(2081, 6, 16, timeZone);
String nepaliDateStr = CalendarUtils.convertToNepaliString(new Date(millis), null);
assertEquals( "16 Ashwin 2081", nepaliDateStr);


mockTimeZoneProvider.setTimezone(TimeZone.getTimeZone("Asia/Kathmandu"));
timeZone = DateTimeZone.forTimeZone(mockTimeZoneProvider.timeZone);
millis = CalendarUtils.toMillisFromJavaEpoch(2081, 6, 16, timeZone);
nepaliDateStr = CalendarUtils.convertToNepaliString(new Date(millis), null);
assertEquals( "16 Ashwin 2081", nepaliDateStr);


mockTimeZoneProvider.setTimezone(TimeZone.getTimeZone("America/Chicago"));
timeZone = DateTimeZone.forTimeZone(mockTimeZoneProvider.timeZone);
millis = CalendarUtils.toMillisFromJavaEpoch(2081, 6, 16, timeZone);
nepaliDateStr = CalendarUtils.convertToNepaliString(new Date(millis), null);
assertEquals( "16 Ashwin 2081", nepaliDateStr);
DateUtils.resetTimezoneProvider();
}

private static void assertSameDate(UniversalDate a, UniversalDate b) {
assertEquals(a.day, b.day);
assertEquals(a.month, b.month);
Expand Down Expand Up @@ -63,7 +110,8 @@ public void testUnpackingDateInDifferentTimezone() {
mexicoCal.set(2007, Calendar.JULY, 7, 18, 46);

UniversalDate mexicanDate = CalendarUtils.fromMillis(mexicoCal.getTimeInMillis(), mexicanTimeZone);
long time = CalendarUtils.toMillisFromJavaEpoch(mexicanDate.year, mexicanDate.month, mexicanDate.day, mexicanTimeZone);
long time = CalendarUtils.toMillisFromJavaEpoch(mexicanDate.year, mexicanDate.month, mexicanDate.day,
mexicanTimeZone);
UniversalDate rebuiltDateInUsingDifferentTimezone = CalendarUtils.fromMillis(time, nepaliTimeZone);
assertSameDate(rebuiltDateInUsingDifferentTimezone, mexicanDate);
}
Expand Down Expand Up @@ -103,4 +151,22 @@ public void serializeUniversalDateViaMillisTest() {
deserializedNepaliDate = CalendarUtils.fromMillis(date.getTime(), bostonTimeZone);
assertSameDate(nepaliDate, deserializedNepaliDate);
}

private class MockTimeZoneProvider extends TimezoneProvider {

private TimeZone timeZone;

public MockTimeZoneProvider(TimeZone timeZone) {
this.timeZone = timeZone;
}

public void setTimezone(TimeZone timeZone){
this.timeZone = timeZone;
}

@Override
public TimeZone getTimezone() {
return timeZone;
}
}
}
Loading