cronstrue 2.57.0 → 2.59.0

package/dist/cronstrue-i18n.js

@@ -427,8 +427,24 @@ var ExpressionDescriptor = (function () {
     ExpressionDescriptor.prototype.getHoursDescription = function () {
         var _this = this;
         var expression = this.expressionParts[2];
+        var hourIndex = 0;
+        var rangeEndValues = [];
+        expression
+            .split("/")[0]
+            .split(",")
+            .forEach(function (range) {
+            var rangeParts = range.split("-");
+            if (rangeParts.length === 2) {
+                rangeEndValues.push({ value: rangeParts[1], index: hourIndex + 1 });
+            }
+            hourIndex += rangeParts.length;
+        });
+        var evaluationIndex = 0;
         var description = this.getSegmentDescription(expression, this.i18n.everyHour(), function (s) {
-            return _this.formatTime(s, "0", "");
+            var match = rangeEndValues.find(function (r) { return r.value === s && r.index === evaluationIndex; });
+            var isRangeEndWithNonZeroMinute = match && _this.expressionParts[1] !== "0";
+            evaluationIndex++;
+            return isRangeEndWithNonZeroMinute ? _this.formatTime(s, "59", "") : _this.formatTime(s, "0", "");
         }, function (s) {
             return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Hours(s), s);
         }, function (s) {
@@ -436,16 +452,6 @@ var ExpressionDescriptor = (function () {
         }, function (s) {
             return _this.i18n.atX0();
         });
-        if (description && expression.includes("-") && this.expressionParts[1] != "0") {
-            var atTheHourMatches = Array.from(description.matchAll(/:00/g));
-            if (atTheHourMatches.length > 1) {
-                var lastAtTheHourMatchIndex = atTheHourMatches[atTheHourMatches.length - 1].index;
-                description =
-                    description.substring(0, lastAtTheHourMatchIndex) +
-                        ":59" +
-                        description.substring(lastAtTheHourMatchIndex + 3);
-            }
-        }
         return description;
     };
     ExpressionDescriptor.prototype.getDayOfWeekDescription = function () {
@@ -2060,8 +2066,8 @@ var da = (function () {
     da.prototype.commaOnlyInX0 = function () {
         return ", kun i %s";
     };
-    da.prototype.commaOnlyOnX0 = function () {
-        return ", på %se";
+    da.prototype.commaOnlyOnX0 = function (s) {
+        return ", på enhver %s";
     };
     da.prototype.commaAndOnX0 = function () {
         return ", og på %s";