Bug/get better ordinalsuffix

app/lib/Parsers/TimeExpressionParser.php

@@ -4320,6 +4320,56 @@ public static function inferRangeQualifier($dates, $options=null) {
 		return null;
 	}
  	# -------------------------------------------------------------------
+
+	/**
+	 * Returns the ordinal suffix for a given number based on language-specific rules.
+	 *
+	 * @param int $number The number for which to get the ordinal suffix.
+	 * @return string The corresponding ordinal suffix according to language rules.
+	 */
+	private function getOrdinalSuffix(int $number): string
+	{
+		$ordinal_rules = $this->opo_language_settings->getList("ordinalSuffixes")?? [];
+		$ordinal_exceptions = $this->opo_language_settings->getAssoc("ordinalSuffixExceptions")?? [];
+		$ordinal_default = $this->opo_language_settings->get("ordinalSuffixDefault")??"";
+		$ordinal_literal_exceptions = $this->opo_language_settings->getAssoc("ordinalSuffixLiteralExceptions")?? [];
+		$ordinal_recycle_base =  $this->opo_language_settings->get("ordinalSuffixRecycleBase")??10;//10,100
+
+
+
+
+		/* some exceptions are entirely literal, don't recycle, for instance dutch 0de (while 100ste) */
+		foreach($ordinal_literal_exceptions as $k=>$ordinal){
+			if ($number==$k)return $ordinal;
+		}
+
+		/* combine rules and exceptions */
+		$ordinals = $ordinal_rules + $ordinal_exceptions;//union instead of merge to preserve the keys
+
+		/* order desc so higher rules get preference, ie 18de on 8ste */
+		krsort($ordinals);
+
+		//return json_encode($ordinals);
+
+		/* early default */
+		if(is_array($ordinals) && count($ordinals)>0){
+
+			$highestIndex = max(array_keys($ordinals));
+			$recycleableStem = $number%$ordinal_recycle_base;
+			if($number>$highestIndex && $number<=$recycleableStem){
+				return $ordinal_default;
+			}
+
+			/* within the ruleset */
+			foreach	($ordinals as $k=>$ordinal){
+				if(str_ends_with((string)$number, (string)$k))return $ordinal;
+			}
+		}
+
+		return $ordinal_default;
+	}
+
+
  	/** 
  	 *
  	 */
@@ -4330,17 +4380,7 @@ public function makeCenturyString($dates, $options) {
  		$century = intval((int)$start_pieces['year']/100);
 		$century = ((int)$end_pieces['year'] > 0) ? ((int)$century + 1) : ((int)$century - 1);
 
-		$ordinals = $this->opo_language_settings->getList("ordinalSuffixes");
-		$ordinal_exceptions = $this->opo_language_settings->get("ordinalSuffixExceptions");
-		$ordinal_default = $this->opo_language_settings->get("ordinalSuffixDefault");
-
-		$x = intval(substr((string)$century, -1));
-
-		if(is_array($ordinal_exceptions) && isset($ordinal_exceptions[$century])) {
-			$ordinal = $ordinal_exceptions[$century];
-		} else {
-			$ordinal = isset($ordinals[$x]) ? $ordinals[$x] : $ordinal_default;
-		}
+		$ordinal = $this->getOrdinalSuffix($century);
 
 		$century_indicators = $this->opo_language_settings->getList("centuryIndicator");
 

app/lib/Parsers/TimeExpressionParser/nl_BE.lang

@@ -83,9 +83,12 @@ decadeIndicator = [s]
 
 # list of numeric suffixes, starting with the one for zero
 # (eg. 0th, 1st, 2nd, 3rd would be a list like so: [th, st, nd, rd])
-# NL: irregular up until 20 - afterwards the default is "ste"
-ordinalSuffixes = [de, ste, de, de, de, de, de, de, ste, de, de, de, de, de, de, de, de, de, de, de, ste]
+# NL: irregular up until 20 - afterwards the default is "ste" - highjacked zero because recurring zeros follow ste, only first 'zero' zero has 'de'
+ordinalSuffixes = [ste, ste, de, de, de, de, de, de, ste, de, de, de, de, de, de, de, de, de, de, de, ste]
 ordinalSuffixDefault = ste
+#ordinalSuffixExceptions = {18=de,24=ste}
+ordinalSuffixLiteralExceptions = {0=de}
+ordinalSuffixRecycleBase=100
 
 # in delimited dates (ex. 12/10/2009) is the first number a month or a day?
 # set to "0" for European style dates (day comes first); "1" for American-style dates (month comes first)

app/lib/Parsers/TimeExpressionParser/nl_NL.lang

@@ -83,9 +83,12 @@ decadeIndicator = [s]
 
 # list of numeric suffixes, starting with the one for zero
 # (eg. 0th, 1st, 2nd, 3rd would be a list like so: [th, st, nd, rd])
-# NL: irregular up until 20 - afterwards the default is "ste"
-ordinalSuffixes = [de, ste, de, de, de, de, de, de, ste, de, de, de, de, de, de, de, de, de, de, de, ste]
+# NL: irregular up until 20 - afterwards the default is "ste" - highjacked zero because recurring zeros follow ste, only first 'zero' zero has 'de'
+ordinalSuffixes = [ste, ste, de, de, de, de, de, de, ste, de, de, de, de, de, de, de, de, de, de, de, ste]
 ordinalSuffixDefault = ste
+#ordinalSuffixExceptions = {18=de,24=ste}
+ordinalSuffixLiteralExceptions = {0=de}
+ordinalSuffixRecycleBase=100
 
 # in delimited dates (ex. 12/10/2009) is the first number a month or a day?
 # set to "0" for European style dates (day comes first); "1" for American-style dates (month comes first)