fix(calendars/ethiopian): fix month number in ethiopian pipe

gnucoop · Jan 10, 2022 · efc186e · efc186e
1 parent 27bcb62
commit efc186e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/calendars/ethiopian/calendar-service.ts b/src/calendars/ethiopian/calendar-service.ts
@@ -212,7 +212,7 @@ export class AjfEthiopianCalendarService extends AjfCalendarService {
     const ecDate = EthiopianDate.gregorianToEthiopian(viewDate);
     let curYear: number = ecDate.getFullYear();
     let firstYear = curYear - (curYear % 10) + 1;
-    let curDate: Date = EthiopianDate.ethiopianToGregorian(firstYear, 1, 1);
+    let curDate: Date = EthiopianDate.ethiopianToGregorian(firstYear, 0, 1);
 
     let rows: AjfCalendarEntry[][] = [];
     for (let i = 0; i < 4; i++) {

diff --git a/src/calendars/ethiopian/ethiopian-date-pipe.ts b/src/calendars/ethiopian/ethiopian-date-pipe.ts
@@ -30,7 +30,7 @@ export class AjfEthiopianDatePipe implements PipeTransform {
     try {
       const ed = EthiopianDate.gregorianToEthiopian(value);
       const date = `0${ed.getDate()}`.slice(-2);
-      const month = `0${ed.getMonth()}`.slice(-2);
+      const month = `0${ed.getMonth() + 1}`.slice(-2);
       return `${date}/${month}/${ed.getFullYear()}`;
     } catch (e) {
       return null;

diff --git a/src/calendars/ethiopian/ethiopian-date.ts b/src/calendars/ethiopian/ethiopian-date.ts
@@ -53,11 +53,7 @@ export class EthiopianDate {
         ];
         this._gc = EthiopianDate.ethiopianToGregorian(this._year, this._month, this._date);
       } else if (typeof val === 'object' && val instanceof Date) {
-        const result = EthiopianDate.gregorianToEthiopian(
-          val.getFullYear(),
-          val.getMonth() + 1,
-          val.getDate(),
-        );
+        const result = EthiopianDate.gregorianToEthiopian(val);
         [this._year, this._month, this._date] = [
           result.getFullYear(),
           result.getMonth(),
@@ -140,7 +136,7 @@ export class EthiopianDate {
    * @param val - A numeric year value if the second and third parameters are
    *                                   provided, it should be a date string if not
    * @param month A zero-based numeric value for the month
-   *                         (0 for January, 11 for December)
+   *                         (0 for መስከረም, 12 for ጳጉሜን)
    * @param day A numeric value equal for the day of the month.
    *
    * @api public
@@ -170,6 +166,16 @@ export class EthiopianDate {
     return new Date(gc[0], gc[1] - 1, gc[2]);
   }
 
+  /**
+   *
+   * @param val - A numeric year value if the second and third parameters are
+   *                                   provided, it should be a date string if not
+   * @param month A zero-based numeric value for the month
+   *                         (0 for January, 11 for December)
+   * @param day A numeric value equal for the day of the month.
+   *
+   * @api public
+   */
   static gregorianToEthiopian(
     val?: Date | string | number,
     month?: number,