Since version 3.1.1 the following set notation is also possible.
+
+ - {n: n % 10 > 1 && n % 10 < 5} -- matches numbers like 2, 3, 4, 22, 23, 24
+
+
+Where set is defined by the expression after n:. In particular, the expression
+accepts the following mathematical/logical operators to form a set of logical conditions
+on the value given by n:
+
+ - < -- less than.
+ - <= -- less than equals.
+ - > -- greater than.
+ - >= -- greater than equals.
+ - == -- of equal value.
+ - % -- modulo, e.g., 1 % 10 equals 1, 11 % 10 equals 1.
+ - - -- minus, negative.
+ - + -- addition.
+ - & -- conditional AND.
+ - && -- condition AND with short circuit.
+ - | -- conditional OR.
+ - || -- conditional OR with short circuit.
+ - ! -- negation.
+
+Additional round brackets can also be used to perform grouping. The following example
+represents ordinal values in English such as: "0th", "1st", "2nd", "3rd", "4th", "11th", "21st", "22nd", etc.
+
+
+<com:TChoiceFormat Value="21">
+ {n: (n > 0) && (n < 10 || n > 20) && n % 10 == 1} {Value}st
+|{n: (n > 0) && (n < 10 || n > 20) && n % 10 == 2} {Value}nd
+|{n: (n > 0) && (n < 10 || n > 20) && n % 10 == 3} {Value}rd
+|{n: n > -1 } {Value}th
+|(-Inf, 0) {Value}
+</com:TChoiceFormat>
+
+
+
-$Id$
\ No newline at end of file
+$Id$
diff --git a/framework/I18N/TChoiceFormat.php b/framework/I18N/TChoiceFormat.php
index bf646c31..eeca3541 100644
--- a/framework/I18N/TChoiceFormat.php
+++ b/framework/I18N/TChoiceFormat.php
@@ -47,6 +47,28 @@ Prado::using('System.I18N.TTranslate');
* Properties
* - Value, float,
*
Gets or sets the Value that determines which string choice to display.
+ * Since version 3.1.2 the following set notation is also possible.
+ *
+ * # {n: n % 10 > 1 && n % 10 < 5} -- matches numbers like 2, 3, 4, 22, 23, 24
+ *
+ * Where set is defined by the expression after n:. In particular, the expression
+ * accepts the following mathematical/logical operators to form a set of logical conditions
+ * on the value given by n:
+ * # < -- less than.
+ * # <= -- less than equals.
+ * # > -- greater than.
+ * # >= -- greater than equals.
+ * # == -- of equal value.
+ * # % -- modulo, e.g., 1 % 10 equals 1, 11 % 10 equals 1.
+ * # - -- minus, negative.
+ * # + -- addition.
+ * # & -- conditional AND.
+ * # && -- condition AND with short circuit.
+ * # | -- conditional OR.
+ * # || -- conditional OR with short circuit.
+ * # ! -- negation.
+ *
+ * Additional round brackets can also be used to perform grouping.
*
* @author Xiang Wei Zhuo
* @version v1.0, last update on Fri Dec 24 21:38:49 EST 2004
@@ -86,4 +108,4 @@ class TChoiceFormat extends TTranslate
return strtr($string, array('{Value}'=> $value));
}
}
-?>
\ No newline at end of file
+?>
diff --git a/framework/I18N/core/ChoiceFormat.php b/framework/I18N/core/ChoiceFormat.php
index d36ab57b..b8eb69f0 100644
--- a/framework/I18N/core/ChoiceFormat.php
+++ b/framework/I18N/core/ChoiceFormat.php
@@ -41,14 +41,37 @@
*
* The message/string choices are separated by the pipe "|" followed
* by a set notation of the form
- * # [1,2] -- accepts values between 1 and 2, inclusive.
- * # (1,2) -- accepts values between 1 and 2, excluding 1 and 2.
- * # {1,2,3,4} -- only values defined in the set are accepted.
- * # [-Inf,0) -- accepts value greater or equal to negative infinity
+ * # [1,2] -- accepts values between 1 and 2, inclusive.
+ * # (1,2) -- accepts values between 1 and 2, excluding 1 and 2.
+ * # {1,2,3,4} -- only values defined in the set are accepted.
+ * # [-Inf,0) -- accepts value greater or equal to negative infinity
* and strictly less than 0
* Any non-empty combinations of the delimiters of square and round brackets
* are acceptable.
*
+ * Since version 3.1.2 the following set notation is also possible.
+ *
+ * # {n: n % 10 > 1 && n % 10 < 5} -- matches numbers like 2, 3, 4, 22, 23, 24
+ *
+ * Where set is defined by the expression after n:. In particular, the expression
+ * accepts the following mathematical/logical operators to form a set of logical conditions
+ * on the value given by n:
+ * # < -- less than.
+ * # <= -- less than equals.
+ * # > -- greater than.
+ * # >= -- greater than equals.
+ * # == -- of equal value.
+ * # % -- modulo, e.g., 1 % 10 equals 1, 11 % 10 equals 1.
+ * # - -- minus, negative.
+ * # + -- addition.
+ * # & -- conditional AND.
+ * # && -- condition AND with short circuit.
+ * # | -- conditional OR.
+ * # || -- conditional OR with short circuit.
+ * # ! -- negation.
+ *
+ * Additional round brackets can also be used to perform grouping.
+ *
* @author Xiang Wei Zhuo
* @version v1.0, last update on Fri Dec 24 20:46:16 EST 2004
* @package System.I18N.core
@@ -200,4 +223,4 @@ class ChoiceFormat
}
}
-?>
\ No newline at end of file
+?>
--
cgit v1.2.3