From d88930d23f712f9b9da279f32ee689e6d719f13b Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 15 Feb 2008 01:09:36 +0000
Subject: update docs on TChoiceFormat

---
 .../quickstart/protected/pages/Advanced/I18N.page  | 40 +++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'demos/quickstart')

diff --git a/demos/quickstart/protected/pages/Advanced/I18N.page b/demos/quickstart/protected/pages/Advanced/I18N.page
index 32dd8ac6..73ff1d04 100644
--- a/demos/quickstart/protected/pages/Advanced/I18N.page
+++ b/demos/quickstart/protected/pages/Advanced/I18N.page
@@ -356,5 +356,43 @@ is "One Apple". If the <tt>Value</tt> was "2", then it will show "Two Apples".</
 <p id="790665" class="block-content">Any non-empty combinations of the delimiters of square and round brackets are acceptable.
 The string chosen for display depends on the <tt>Value</tt> property. The <tt>Value</tt> is evaluated for each set until the <tt>Value</tt> is found to belong to a particular set.</p>
 
+<com:SinceVersion Version="3.1.1" />
+<pi class="block-content"> Since version 3.1.1 the following set notation is also possible.</p>
+<ul class="block-content">
+    <li> <tt>{n: n % 10 > 1 && n % 10 < 5}</tt> --  matches numbers like 2, 3, 4, 22, 23, 24</li>
+</ul>
+
+<p class="block-content">Where set is defined by the expression after <tt>n:</tt>. In particular, the expression
+accepts the following mathematical/logical operators to form a set of logical conditions
+on the value given by <tt>n</tt>:</p>
+<ul class="block-content">
+    <li><tt>&lt;</tt> -- less than.</li>
+    <li><tt>&lt;=</tt> -- less than equals.</li>
+    <li><tt>&gt;</tt> -- greater than.</li>
+    <li><tt>&gt=</tt> -- greater than equals.</li>
+    <li><tt>==</tt> -- of equal value.</li>
+    <li><tt>%</tt> -- modulo, e.g., 1 % 10 equals 1, 11 % 10 equals 1.</li>
+    <li><tt>-</tt> -- minus, negative.</li>
+    <li><tt>+</tt> -- addition.</li>
+    <li><tt>&amp;</tt> -- conditional AND.</li>
+    <li><tt>&amp;&amp;</tt> -- condition AND with short circuit.</li>
+    <li><tt>|</tt> -- conditional OR.</li>
+    <li><tt>||</tt> -- conditional OR with short circuit. </li>
+    <li><tt>!</tt> -- negation.</li>
+</ul>
+<p class="block-content">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.</p>
+
+<com:TTextHighlighter Language="prado" CssClass="source block-content" >
+&lt;com:TChoiceFormat Value="21"&gt;
+ {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}
+&lt;/com:TChoiceFormat&gt;
+</com:TTextHighlighter>
+
+
 
-<div class="last-modified">$Id$</div></com:TContent>
\ No newline at end of file
+<div class="last-modified">$Id$</div></com:TContent>
-- 
cgit v1.2.3