Omit "every 1 days" and "every 1 months" text

tocalabs · Jun 25, 2019 · b013556 · b013556
1 parent 3ebe1b6
commit b013556
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 137 deletions.
diff --git a/src/cronParser.ts b/src/cronParser.ts
@@ -59,10 +59,13 @@ export class CronParser {
   }
 
   protected normalize(expressionParts: string[]): void {
-    // Convert ? to * only for DOM and DOW
+    // Convert ? to * for DOM and DOW
     expressionParts[3] = expressionParts[3].replace("?", "*");
     expressionParts[5] = expressionParts[5].replace("?", "*");
 
+    // Convert ? to * for Hour. ? isn't valid for hour position but we can work around it.
+    expressionParts[2] = expressionParts[2].replace("?", "*");
+
     // Convert 0/, 1/ to */
     if (expressionParts[0].indexOf("0/") == 0) {
       // Seconds

diff --git a/src/expressionDescriptor.ts b/src/expressionDescriptor.ts
@@ -285,7 +285,12 @@ export class ExpressionDescriptor {
           return daysOfWeekNames[parseInt(exp)];
         },
         s => {
-          return StringUtilities.format(this.i18n.commaEveryX0DaysOfTheWeek(), s);
+          if (parseInt(s) == 1) {
+            // rather than "every 1 days" just return empty string
+            return "";
+          } else {
+            return StringUtilities.format(this.i18n.commaEveryX0DaysOfTheWeek(), s);
+          }
         },
         s => {
           return this.i18n.commaX0ThroughX1();
@@ -340,7 +345,13 @@ export class ExpressionDescriptor {
         return monthNames[parseInt(s) - 1];
       },
       s => {
-        return StringUtilities.format(this.i18n.commaEveryX0Months(), s);
+        //
+        if (parseInt(s) == 1) {
+          // rather than "every 1 months" just return empty string
+          return "";
+        } else {
+          return StringUtilities.format(this.i18n.commaEveryX0Months(), s);
+        }
       },
       s => {
         return this.i18n.commaMonthX0ThroughMonthX1() || this.i18n.commaX0ThroughX1();
@@ -570,8 +581,8 @@ export class ExpressionDescriptor {
 
   protected transformVerbosity(description: string, useVerboseFormat: boolean) {
     if (!useVerboseFormat) {
-      description = description.replace(new RegExp(this.i18n.commaEveryMinute(), "g"), "");
-      description = description.replace(new RegExp(this.i18n.commaEveryHour(), "g"), "");
+      description = description.replace(new RegExp(`, ${this.i18n.everyMinute()}`, "g"), "");
+      description = description.replace(new RegExp(`, ${this.i18n.everyHour()}`, "g"), "");
       description = description.replace(new RegExp(this.i18n.commaEveryDay(), "g"), "");
       description = description.replace(/\, ?$/, "");
     }

diff --git a/src/i18n/locale.ts b/src/i18n/locale.ts
@@ -53,8 +53,6 @@ export interface Locale {
   commaEveryX0Days(): string;
   commaBetweenDayX0AndX1OfTheMonth(): string;
   commaOnDayX0OfTheMonth(): string;
-  commaEveryMinute(): string;
-  commaEveryHour(): string;
   commaEveryX0Years(): string;
   commaStartingX0(): string;
   daysOfTheWeek(): string[];

diff --git a/src/i18n/locales/cs.ts b/src/i18n/locales/cs.ts
@@ -145,12 +145,6 @@ export class cs implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", %s. den v měsíci";
   }
-  commaEveryMinute() {
-    return ", každou minutu";
-  }
-  commaEveryHour() {
-    return ", každou hodinu";
-  }
   commaEveryX0Years() {
     return ", každých %s roků";
   }

diff --git a/src/i18n/locales/da.ts b/src/i18n/locales/da.ts
@@ -32,12 +32,6 @@ export class da implements Locale {
   commaEveryDay() {
     return ", hver dag";
   }
-  commaEveryHour() {
-    return ", hver time";
-  }
-  commaEveryMinute() {
-    return ", hvert minut";
-  }
   commaEveryX0Days() {
     return ", hver %s. dag";
   }

diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts
@@ -143,12 +143,6 @@ export class de implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", am %s Tag des Monats";
   }
-  commaEveryMinute() {
-    return ", jede Minute";
-  }
-  commaEveryHour() {
-    return ", jede Stunde";
-  }
   commaEveryX0Years() {
     return ", alle %s Jahre";
   }

diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
@@ -145,9 +145,6 @@ export class en implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", on day %s of the month";
   }
-  commaEveryMinute() {
-    return ", every minute";
-  }
   commaEveryHour() {
     return ", every hour";
   }

diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
@@ -46,12 +46,6 @@ export class es implements Locale {
   commaEveryDay() {
     return ", cada día";
   }
-  commaEveryHour() {
-    return ", cada hora";
-  }
-  commaEveryMinute() {
-    return ", cada minuto";
-  }
   commaEveryX0Days() {
     return ", cada %s días";
   }

diff --git a/src/i18n/locales/fr.ts b/src/i18n/locales/fr.ts
@@ -145,12 +145,6 @@ export class fr implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", le %s du mois";
   }
-  commaEveryMinute() {
-    return ", toutes les minutes";
-  }
-  commaEveryHour() {
-    return ", toutes les heures";
-  }
   commaEveryX0Years() {
     return ", tous les %s ans";
   }

diff --git a/src/i18n/locales/he.ts b/src/i18n/locales/he.ts
@@ -144,12 +144,6 @@ export class he implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", ביום ה%s של החודש";
   }
-  commaEveryMinute() {
-    return ", כל דקה";
-  }
-  commaEveryHour() {
-    return ", כל שעה";
-  }
   commaEveryX0Years() {
     return ", כל %s שנים";
   }
@@ -175,4 +169,4 @@ export class he implements Locale {
       "דצמבר"
     ];
   }
-}
+}
diff --git a/src/i18n/locales/it.ts b/src/i18n/locales/it.ts
@@ -46,12 +46,6 @@ export class it implements Locale {
   commaEveryDay() {
     return ", ogni giorno";
   }
-  commaEveryHour() {
-    return ", ogni ora";
-  }
-  commaEveryMinute() {
-    return ", ogni minuto";
-  }
   commaEveryX0Days() {
     return ", ogni %s giorni";
   }

diff --git a/src/i18n/locales/nb.ts b/src/i18n/locales/nb.ts
@@ -44,12 +44,6 @@ export class nb implements Locale {
   commaEveryDay() {
     return ", hver dag";
   }
-  commaEveryHour() {
-    return ", hver time";
-  }
-  commaEveryMinute() {
-    return ", hvert minutt";
-  }
   commaEveryX0Days() {
     return ", hver %s dag";
   }

diff --git a/src/i18n/locales/nl.ts b/src/i18n/locales/nl.ts
@@ -143,12 +143,6 @@ export class nl implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", op dag %s van de maand";
   }
-  commaEveryMinute() {
-    return ", elke minuut";
-  }
-  commaEveryHour() {
-    return ", elk uur";
-  }
   commaEveryX0Years() {
     return ", elke %s jaren";
   }

diff --git a/src/i18n/locales/pl.ts b/src/i18n/locales/pl.ts
@@ -44,12 +44,6 @@ export class pl implements Locale {
   commaEveryDay() {
     return ", co dzień";
   }
-  commaEveryHour() {
-    return ", co godzinę";
-  }
-  commaEveryMinute() {
-    return ", co minutę";
-  }
   commaEveryX0Days() {
     return ", co %s dni";
   }

diff --git a/src/i18n/locales/pt_BR.ts b/src/i18n/locales/pt_BR.ts
@@ -44,12 +44,6 @@ export class pt_BR implements Locale {
   commaEveryDay() {
     return ", a cada dia";
   }
-  commaEveryHour() {
-    return ", a cada hora";
-  }
-  commaEveryMinute() {
-    return ", a cada minuto";
-  }
   commaEveryX0Days() {
     return ", a cada %s dias";
   }

diff --git a/src/i18n/locales/ro.ts b/src/i18n/locales/ro.ts
@@ -33,12 +33,6 @@ export class ro implements Locale {
   commaEveryDay() {
     return ", în fiecare zi";
   }
-  commaEveryHour() {
-    return ", în fiecare oră";
-  }
-  commaEveryMinute() {
-    return ", în fiecare minut";
-  }
   commaEveryX0Days() {
     return ", la fiecare %s zile";
   }

diff --git a/src/i18n/locales/ru.ts b/src/i18n/locales/ru.ts
@@ -143,12 +143,6 @@ export class ru implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", в %s число месяца";
   }
-  commaEveryMinute() {
-    return ", каждую минуту";
-  }
-  commaEveryHour() {
-    return ", каждый час";
-  }
   commaEveryX0Years() {
     return ", каждые %s лет";
   }

diff --git a/src/i18n/locales/sk.ts b/src/i18n/locales/sk.ts
@@ -145,12 +145,6 @@ export class sk implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", %s. deň v mesiaci";
   }
-  commaEveryMinute() {
-    return ", každú minutu";
-  }
-  commaEveryHour() {
-    return ", každú hodinu";
-  }
   commaEveryX0Years() {
     return ", každých %s rokov";
   }

diff --git a/src/i18n/locales/sl.ts b/src/i18n/locales/sl.ts
@@ -32,12 +32,6 @@ export class sl implements Locale {
   commaEveryDay() {
     return ", vsak dan";
   }
-  commaEveryHour() {
-    return ", vsako uro";
-  }
-  commaEveryMinute() {
-    return ", vsako minuto";
-  }
   commaEveryX0Days() {
     return ", vsakih %s dni";
   }

diff --git a/src/i18n/locales/sv.ts b/src/i18n/locales/sv.ts
@@ -143,12 +143,6 @@ export class sv implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", på dag %s av månaden";
   }
-  commaEveryMinute() {
-    return ", varje minut";
-  }
-  commaEveryHour() {
-    return ", varje timme";
-  }
   commaEveryX0Years() {
     return ", var %s år";
   }

diff --git a/src/i18n/locales/sw.ts b/src/i18n/locales/sw.ts
@@ -148,12 +148,6 @@ export class sw implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", siku ya %s ya mwezi";
   }
-  commaEveryMinute() {
-    return ", kila dakika";
-  }
-  commaEveryHour() {
-    return ", kila saa";
-  }
   commaEveryX0Years() {
     return ", kila miaka %s";
   }

diff --git a/src/i18n/locales/tr.ts b/src/i18n/locales/tr.ts
@@ -143,12 +143,6 @@ export class tr implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", ayın %s. günü";
   }
-  commaEveryMinute() {
-    return ", her dakika";
-  }
-  commaEveryHour() {
-    return ", her saat";
-  }
   commaEveryX0Years() {
     return ", %s yılda bir";
   }

diff --git a/src/i18n/locales/uk.ts b/src/i18n/locales/uk.ts
@@ -143,12 +143,6 @@ export class uk implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", на %s день місяця";
   }
-  commaEveryMinute() {
-    return ", щохвилини";
-  }
-  commaEveryHour() {
-    return ", щогодини";
-  }
   commaEveryX0Years() {
     return ", кожні %s роки";
   }

diff --git a/src/i18n/locales/zh_CN.ts b/src/i18n/locales/zh_CN.ts
@@ -143,12 +143,6 @@ export class zh_CN implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", 每月的 %s 号";
   }
-  commaEveryMinute() {
-    return ", 每分钟";
-  }
-  commaEveryHour() {
-    return ", 每小时";
-  }
   commaEveryX0Years() {
     return ", 每 %s 年";
   }

diff --git a/src/i18n/locales/zh_TW.ts b/src/i18n/locales/zh_TW.ts
@@ -143,12 +143,6 @@ export class zh_TW implements Locale {
   commaOnDayX0OfTheMonth() {
     return ", 每月的 %s 號";
   }
-  commaEveryMinute() {
-    return ", 每分鐘";
-  }
-  commaEveryHour() {
-    return ", 每小時";
-  }
   commaEveryX0Years() {
     return ", 每 %s 年";
   }

diff --git a/test/cronstrue.ts b/test/cronstrue.ts
@@ -77,6 +77,14 @@ describe("Cronstrue", function() {
     it("0 9-17 * * *", function() {
       assert.equal(construe.toString(this.test.title), "Every hour, between 09:00 AM and 05:59 PM");
     });
+
+    it("0 * ? * 2/1 *", function() {
+      assert.equal(construe.toString(this.test.title), "Every minute, February through December");
+    });
+
+    it("0 * ? * 2/1", function() {
+      assert.equal(construe.toString(this.test.title), "Every hour, Tuesday through Saturday");
+    });
   });
 
   describe("ranges", function() {