# HG changeset patch
# User paulb
# Date 1142618829 0
# Node ID 3726d27b821e2eb45f018dd05016b06c2b8c0ac6
# Parent  b9beddebc10e1189ee985b4feb8774ffd0488332
[project @ 2006-03-17 18:07:09 by paulb]
Reordered the substitution preferences, making template:i18n more important
than template:value.
Added expression support to template:i18n annotations, along with a means
of controlling the fallback output in cases where no translations are
found for a value.

diff -r b9beddebc10e -r 3726d27b821e XSLForms/XSL/Prepare.xsl
--- a/XSLForms/XSL/Prepare.xsl	Fri Mar 17 18:05:21 2006 +0000
+++ b/XSLForms/XSL/Prepare.xsl	Fri Mar 17 18:07:09 2006 +0000
@@ -230,14 +230,14 @@
 
   <xsl:template name="special-value">
     <xsl:choose>
+      <!-- Insert the translated value. -->
+      <xsl:when test="@template:i18n">
+        <xsl:call-template name="translated-value"/>
+      </xsl:when>
       <!-- Insert the stated value. -->
       <xsl:when test="@template:value">
         <axsl:value-of select="{@template:value}"/>
       </xsl:when>
-      <!-- Insert the translated value. -->
-      <xsl:when test="@template:i18n">
-        <xsl:call-template name="translated-value"/>
-      </xsl:when>
       <!-- Copy the stated expression. -->
       <xsl:when test="@template:copy">
         <axsl:copy-of select="{@template:copy}"/>
@@ -269,6 +269,17 @@
           select="$translations/translations/locale[code/@value=$locale]/translation[@value='{text()}']/text()"/>
         <xsl:call-template name="insert-translated-value"/>
       </xsl:when>
+      <!-- Look for a translation based on the expression. -->
+      <xsl:when test="starts-with(@template:i18n, '{') and substring(@template:i18n, string-length(@template:i18n), 1) = '}'">
+        <!-- Select the expression. -->
+        <axsl:variable name="i18n-expr" select="{substring(@template:i18n, 2, string-length(@template:i18n) - 2)}"/>
+        <!-- Translate according to the expression. -->
+        <axsl:variable name="translation"
+          select="$translations/translations/locale[code/@value=$locale]/translation[@value=$i18n-expr]/text()"/>
+        <xsl:call-template name="insert-translated-value">
+          <xsl:with-param name="default">$i18n-expr</xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
       <!-- Look for a named translation. -->
       <xsl:otherwise>
         <!-- NOTE: Quoting not done completely. -->
@@ -280,6 +291,7 @@
   </xsl:template>
 
   <xsl:template name="insert-translated-value">
+    <xsl:param name="default"/>
     <axsl:choose>
       <!-- Insert the translated value. -->
       <axsl:when test="$translation">
@@ -287,7 +299,14 @@
       </axsl:when>
       <!-- Otherwise, just process the descendants. -->
       <axsl:otherwise>
-        <xsl:apply-templates select="node()"/>
+        <xsl:choose>
+          <xsl:when test="$default">
+            <axsl:value-of select="{$default}"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates select="node()"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </axsl:otherwise>
     </axsl:choose>
   </xsl:template>