Skip to content

Commit

Permalink
1.0.9.RELEASE
Browse files Browse the repository at this point in the history
  • Loading branch information
@chanmratekoko
chanmratekoko committed May 24, 2024
1 parent 8d9ba18 commit e9400f0
Show file tree
Hide file tree
Showing 16 changed files with 164 additions and 85 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[![GitHublicense](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/chanmratekoko/mmcalendar/blob/master/LICENSE) [![Maven Central](https://img.shields.io/badge/Maven%20Central-1.0.6.RELEASE-blue.svg)](https://search.maven.org/remote_content?g=com.github.chanmratekoko&a=myanmar-calendar&v=LATEST)
[![GitHublicense](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/chanmratekoko/mmcalendar/blob/master/LICENSE) [![Maven Central](https://img.shields.io/badge/Maven%20Central-1.0.9.RELEASE-blue.svg)](https://search.maven.org/remote_content?g=com.github.chanmratekoko&a=myanmar-calendar&v=LATEST)

# Myanmar Calendar
**Myanmar Calendar** library for Android and Java applications.
Expand All @@ -15,15 +15,15 @@ Usage
<dependency>
<groupId>com.github.chanmratekoko</groupId>
<artifactId>myanmar-calendar</artifactId>
<version>1.0.8.RELEASE</version>
<version>1.0.9.RELEASE</version>
</dependency>
```

**2. Gradle dependency**
- Add this to your app `build.gradle`:

```gradle
compile 'com.github.chanmratekoko:myanmar-calendar:1.0.8.RELEASE'
compile 'com.github.chanmratekoko:myanmar-calendar:1.0.9.RELEASE'
```

**3. jar file**
Expand Down
5 changes: 5 additions & 0 deletions VERSION.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### 1.0.9.RELEASE

* Change Buddhist Era Calculations
* Update Holidays For 2024
* Bug Fix Myanmar Month Names translations.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.chanmratekoko</groupId>
<artifactId>myanmar-calendar</artifactId>
<version>1.0.8.RELEASE</version>
<version>1.0.9.RELEASE</version>
<name>Myanmar Calendar</name>
<description>
The Myanmar Calendar Library provides precise calculations for the traditional Burmese calendar system,
Expand Down
141 changes: 99 additions & 42 deletions src/main/java/mmcalendar/HolidayCalculator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,20 @@ private HolidayCalculator() {
* <a href="https://en.wikipedia.org/wiki/Chinese_New_Year">Chinese New Year</a>
*/
private static final int[] GH_CHINESE_NEW_YEAR = {2456689, 2456690, 2457073, 2457074, 2457427, 2457428, 2457782,
2457783, 2458166, 2458167};
2457783, 2458166, 2458520, 2458874, 2459257, 2459612, 2459967, 2460351,
2460705, 2461089, 2461443, 2461797, 2462181, 2462536};

/**
* Diwali (ghDiwali)
*/
private static final int[] GH_DIWALI = {2456599, 2456953, 2457337, 2457691, 2458045, 2458429};
private static final int[] GH_DIWALI = {2456599, 2456953, 2457337, 2457691, 2458045, 2458430, 2458784, 2459168,
2459523, 2459877};

/**
* EID ghEid
*/
private static final int[] GH_EID = {2456513, 2456867, 2457221, 2457576, 2457930, 2458285};
private static final int[] GH_EID = {2456513, 2456867, 2457221, 2457576, 2457930, 2458285, 2458640, 2459063,
2459416, 2459702, 2460125, 2460261};

/**
* Check for English Holiday
Expand All @@ -53,25 +56,25 @@ static List<String> englishHoliday(int gy, int gm, int gd) {

List<String> holiday = new ArrayList<>();

if (gy >= 2018 && gm == 1 && gd == 1) {
holiday.add("New Year Day");
if ((gy >= 2018 && gy <= 2021) && gm == 1 && gd == 1) {
holiday.add("New Year's Day");
} else if (gy >= 1948 && gm == 1 && gd == 4) {
holiday.add("Independence Day");
} else if (gy >= 1947 && gm == 2 && gd == 12) {
holiday.add("Union Day");
} else if (gy >= 1958 && gm == 3 && gd == 2) {
holiday.add("Peasants Day");
holiday.add("Peasants' Day");
} else if (gy >= 1945 && gm == 3 && gd == 27) {
holiday.add("Resistance Day");
} else if (gy >= 1923 && gm == 5 && gd == 1) {
holiday.add("Labour Day");
} else if (gy >= 1947 && gm == 7 && gd == 19) {
holiday.add("Martyrs Day");
holiday.add("Martyrs' Day");
} else if (gm == 12 && gd == 25) {
holiday.add("Christmas Day");
} else if (gy == 2017 && gm == 12 && gd == 30) {
holiday.add("Holiday");
} else if (gy >= 2017 && gm == 12 && gd == 31) {
} else if ((gy >= 2017 && gy <= 2021) && gm == 12 && gd == 31) {
holiday.add("Holiday");
}

Expand Down Expand Up @@ -108,7 +111,7 @@ else if ((mmonth == 7) && (moonPhase == 1)) {
} else if ((myear >= 1282) && (mmonth == 8) && (monthDay == 25)) {
holiday.add("National Day");
} else if ((mmonth == 10) && (monthDay == 1)) {
holiday.add("Karen New Year Day");
holiday.add("Karen New Year's Day");
} else if ((mmonth == 12) && (moonPhase == 1)) {
holiday.add("Tabaung Pwe");
}
Expand Down Expand Up @@ -147,7 +150,7 @@ public static List<String> thingyan(double jdn, double myear, int monthType) {
atn = Math.round(ja);

if (Math.abs(jdn - (atn + 1)) < 0.0000001) {
holiday.add("Myanmar New Year Day");
holiday.add("Myanmar New Year's Day");
}

if ((myear + monthType) >= bgntg) {
Expand All @@ -162,6 +165,12 @@ public static List<String> thingyan(double jdn, double myear, int monthType) {
} else if (((myear + monthType) >= 1369) && ((myear + monthType) < 1379)
&& ((jdn == (akn - 2)) || ((jdn >= (atn + 2)) && (jdn <= (akn + 7))))) {
holiday.add("Holiday");
} else if ((((myear + monthType) >= 1384) && (myear + monthType) <= 1385)
&& ((jdn == (akn - 5)) || (jdn == (akn - 4)) || (jdn == (akn - 3)) || (jdn == (akn - 2)))) {
holiday.add("Holiday");
} else if ((myear + monthType) >= 1386
&& (((jdn >= (atn + 2)) && (jdn <= (akn + 7))))) {
holiday.add("Holiday");
}
}

Expand All @@ -188,6 +197,28 @@ public static List<String> getOtherHolidays(double jd) {
return holiday;
}

private static List<String> getSubstituteHoliday(double jd) {

List<String> holiday = new ArrayList<>();

int[] substituteHoliday = {
// 2019
2458768, 2458772, 2458785, 2458800,
// 2020
2458855, 2458918, 2458950, 2459051, 2459062,
2459152, 2459156, 2459167, 2459181, 2459184,
// 2021
2459300, 2459303, 2459323, 2459324,
2459335, 2459548, 2459573,
};

if (BinarySearchUtil.search(jd, substituteHoliday) >= 0) {
holiday.add("Holiday");
}

return holiday;
}

/**
* Anniversary day
*
Expand All @@ -202,43 +233,43 @@ private static List<String> getAnniversaryDay(double jd, CalendarType calendarTy
calendarType = CalendarType.ENGLISH;
}

List<String> holiday = new ArrayList<>();
List<String> anniversary = new ArrayList<>();

WesternDate wd = WesternDate.of(jd, calendarType);
double doe = dateOfEaster(wd.getYear());

if ((wd.getYear() <= 2017) && (wd.getMonth() == 1) && (wd.getDay() == 1)) {
holiday.add("New Year Day");
anniversary.add("New Year Day");
} else if ((wd.getYear() >= 1915) && (wd.getMonth() == 2) && (wd.getDay() == 13)) {
holiday.add("G. Aung San BD");
anniversary.add("G. Aung San BD");
} else if ((wd.getYear() >= 1969) && (wd.getMonth() == 2) && (wd.getDay() == 14)) {
holiday.add("Valentines Day");
anniversary.add("Valentines Day");
} else if ((wd.getYear() >= 1970) && (wd.getMonth() == 4) && (wd.getDay() == 22)) {
holiday.add("Earth Day");
anniversary.add("Earth Day");
} else if ((wd.getYear() >= 1392) && (wd.getMonth() == 4) && (wd.getDay() == 1)) {
holiday.add("April Fools Day");
anniversary.add("April Fools' Day");
} else if ((wd.getYear() >= 1948) && (wd.getMonth() == 5) && (wd.getDay() == 8)) {
holiday.add("Red Cross Day");
anniversary.add("Red Cross Day");
} else if ((wd.getYear() >= 1994) && (wd.getMonth() == 10) && (wd.getDay() == 5)) {
holiday.add("World Teachers Day");
anniversary.add("World Teachers' Day");
} else if ((wd.getYear() >= 1947) && (wd.getMonth() == 10) && (wd.getDay() == 24)) {
holiday.add("United Nations Day");
anniversary.add("United Nations Day");
} else if ((wd.getYear() >= 1753) && (wd.getMonth() == 10) && (wd.getDay() == 31)) {
holiday.add("Halloween");
anniversary.add("Halloween");
}

if ((wd.getYear() >= 1876) && (jd == doe)) {
holiday.add("Easter");
anniversary.add("Easter");
} else if ((wd.getYear() >= 1876) && (jd == (doe - 2))) {
holiday.add("Good Friday");
anniversary.add("Good Friday");
} else if (BinarySearchUtil.search(jd, GH_EID_2) >= 0) {
holiday.add("Eid");
anniversary.add("Eid");
}
if (BinarySearchUtil.search(jd, GH_CHINESE_NEW_YEAR) >= 0) {
holiday.add("Chinese New Year");
anniversary.add("Chinese New Year's");
}

return holiday;
return anniversary;
}

/**
Expand Down Expand Up @@ -284,12 +315,12 @@ private static List<String> getMyanmarAnniversaryDay(double myear, int mmonth, i
List<String> holiday = new ArrayList<>();

if ((myear >= 1309) && (mmonth == 11) && (monthDay == 16)) {
holiday.add("Mon National Day");
holiday.add("'Mon' National Day");
} // the ancient founding of Hanthawady
else if ((mmonth == 9) && (monthDay == 1)) {
holiday.add("Shan New Year Day");
holiday.add("Shan New Year's Day");
if (myear >= 1306) {
holiday.add("Authors Day");
holiday.add("Authors' Day");
}
} // Nadaw waxing moon 1
else if ((mmonth == 3) && (moonPhase == 1)) {
Expand All @@ -299,10 +330,10 @@ else if ((mmonth == 6) && (moonPhase == 1)) {
holiday.add("Garudhamma Day");
} // Tawthalin full moon
else if ((myear >= 1356) && (mmonth == 10) && (moonPhase == 1)) {
holiday.add("Mothers Day");
holiday.add("Mothers' Day");
} // Pyatho full moon
else if ((myear >= 1370) && (mmonth == 12) && (moonPhase == 1)) {
holiday.add("Fathers Day");
holiday.add("Fathers' Day");
} // Tabaung full moon
else if ((mmonth == 5) && (moonPhase == 1)) {
holiday.add("Metta Day");
Expand All @@ -322,15 +353,24 @@ else if ((mmonth == 5) && (monthDay == 23)) {
* @return List of holiday String
*/
public static List<String> getHoliday(MyanmarDate myanmarDate) {
return getHoliday(myanmarDate, Config.getInstance().getCalendarType());
return getHoliday(myanmarDate, Config.getInstance().getLanguage());
}

/**
* @param myanmarDate MyanmarDate
* @param language Language
* @return List of holiday String
*/
public static List<String> getHoliday(MyanmarDate myanmarDate, Language language) {
return getHoliday(myanmarDate, Config.getInstance().getCalendarType(), language);
}

/**
* @param myanmarDate MyanmarDate
* @param calendarType CalendarType
* @return List of holiday String
*/
public static List<String> getHoliday(MyanmarDate myanmarDate, CalendarType calendarType) {
public static List<String> getHoliday(MyanmarDate myanmarDate, CalendarType calendarType, Language language) {

WesternDate westernDate = WesternDate.of(myanmarDate.getJulianDayNumber(), calendarType);
// Office Off
Expand All @@ -342,10 +382,18 @@ public static List<String> getHoliday(MyanmarDate myanmarDate, CalendarType cale

List<String> holiday = new ArrayList<>();

holiday.addAll(hde);
holiday.addAll(hdm);
holiday.addAll(hdt);
holiday.addAll(hdo);
holiday.addAll(LanguageTranslator.translateSentenceList(hde, Language.ENGLISH, language));

holiday.addAll(LanguageTranslator.translateSentenceList(hdm, Language.ENGLISH, language));

holiday.addAll(LanguageTranslator.translateSentenceList(hdt, Language.ENGLISH, language));

holiday.addAll(LanguageTranslator.translateSentenceList(hdo, Language.ENGLISH, language));

if (westernDate.getYear() >= 2019 && westernDate.getYear() <= 2021) {
List<String> substituteHoliday = getSubstituteHoliday(myanmarDate.getJulianDayNumber());
holiday.addAll(LanguageTranslator.translateSentenceList(substituteHoliday, Language.ENGLISH, language));
}

return holiday;
}
Expand All @@ -363,24 +411,33 @@ public static boolean isHoliday(MyanmarDate myanmarDate) {
* @return List of holiday String
*/
public static List<String> getAnniversary(MyanmarDate myanmarDate) {
return getAnniversary(myanmarDate, Config.getInstance().getCalendarType());
return getAnniversary(myanmarDate, Config.getInstance().getCalendarType(), Config.getInstance().getLanguage());
}

/**
* @param myanmarDate MyanmarDate Object
* @param language Language
* @return List of holiday String
*/
public static List<String> getAnniversary(MyanmarDate myanmarDate, Language language) {
return getAnniversary(myanmarDate, Config.getInstance().getCalendarType(), language);
}

/**
* @param myanmarDate MyanmarDate
* @param calendarType CalendarType
* @return List of holiday String
*/
public static List<String> getAnniversary(MyanmarDate myanmarDate, CalendarType calendarType) {
public static List<String> getAnniversary(MyanmarDate myanmarDate, CalendarType calendarType, Language language) {
List<String> ecd = getAnniversaryDay(myanmarDate.getJulianDayNumber(), calendarType); // anniversary day
List<String> mcd = getMyanmarAnniversaryDay(myanmarDate.getYearValue(), myanmarDate.getMonth(), myanmarDate.getDayOfMonth(), myanmarDate.getMoonPhaseValue());

List<String> holiday = new ArrayList<>();
List<String> anniversary = new ArrayList<>();

holiday.addAll(ecd);
holiday.addAll(mcd);
anniversary.addAll(LanguageTranslator.translateSentenceList(ecd, Language.ENGLISH, language));
anniversary.addAll(LanguageTranslator.translateSentenceList(mcd, Language.ENGLISH, language));

return holiday;
return anniversary;
}

}
2 changes: 1 addition & 1 deletion src/main/java/mmcalendar/Language.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public enum Language {
ZAWGYI(2, "၊ ", "။ "),
MON(3, "၊ ", "။ "),
TAI(4, "၊ ", "။ "),
KAREN(5, "၊ ", "။ ");
SGAW_KAREN(5, "၊ ", "။ ");

private final int languageIndex;

Expand Down
22 changes: 20 additions & 2 deletions src/main/java/mmcalendar/LanguageTranslator.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package mmcalendar;

import java.util.List;
import java.util.stream.Collectors;

/**
* Language Translator
*
Expand Down Expand Up @@ -59,7 +62,7 @@ public class LanguageTranslator {
{"Mahayatkyan", "မဟာရက်ကြမ်း", "မဟာရက္ၾကမ္း", "ကိုန်ဟွံခိုဟ်", "မဟာရက်ကြမ်း", "မဟာရက်ကြမ်း"},
{"Nagapor", "နဂါးပေါ်", "နဂါးေပၚ", "နာ်မံက်", "နဂါးပေါ်", "နဂါးပေါ်"},
{"Shanyat", "ရှမ်းရက်", "ရွမ္းရက္", "တ္ၚဲဒတန်", "ရှမ်းရက်", "ရှမ်းရက်"},
{"Mooon", "မွန်", "မြန္", "ပၠန်", "မွၼ်း", "မွန်"},
{"'Mon'", "မွန်", "မြန္", "ပၠန်", "မွၼ်း", "မွန်"},
{"G. Aung San BD", "ဗိုလ်ချုပ်မွေးနေ့", "ဗိုလ္ခ်ဳပ္ေမြးေန႔", "တ္ၚဲသၟိၚ်ဗၟာ အံၚ်သာန်ဒှ်မၞိဟ်", "ဝၼ်းၵိူတ်ၸွမ်သိုၵ်", "ဗိုလ်ချုပ်မွေးနေ့"},
{"Valentines", "ချစ်သူများ", "ခ်စ္သူမ်ား", "ဝုတ်ဗၠာဲ", "ၵေႃႈႁၵ်ႉ", "ချစ်သူများ"},
{"Earth", "ကမ္ဘာမြေ", "ကမၻာေျမ", "ဂၠးကဝ်", "လိၼ်မိူင်း", "ကမ္ဘာမြေ"},
Expand Down Expand Up @@ -205,7 +208,7 @@ private LanguageTranslator() {
*/
private static String translateSentence(String str, int fromLn, int toLn) {
for (String[] dic : CATALOG) {
str = str.replace(dic[fromLn], dic[toLn]);
str = str.replaceAll(dic[fromLn], dic[toLn]);
}
return str;
}
Expand Down Expand Up @@ -237,6 +240,21 @@ private static String translate(String str, int fromLn, int toLn) {
return str;
}

/**
* Translate sentence to the specific language
*
* @param list Sentence List
* @param from Translate Language from
* @param to Translate Language to
* @return translated result
*/
public static List<String> translateSentenceList(List<String> list, Language from, Language to) {
return list.stream()
.map(it ->
LanguageTranslator.translateSentence(it, from, to)
).collect(Collectors.toList());
}

/**
* Translate sentence to the specific language
*
Expand Down
Loading

0 comments on commit e9400f0

Please sign in to comment.