# HG changeset patch
# User paulb
# Date 1133531539 0
# Node ID effe6a5b9199d34beea28513b63bf06dd36f8731
# Parent  65e168404d144ce5ac20138683a8728bb69d5da5
[project @ 2005-12-02 13:52:19 by paulb]
Simplified the template:i18n attribute to only refer to the contents of an
element or a specific translation name (instead of being able to refer to
other attributes to be translated).

diff -r 65e168404d14 -r effe6a5b9199 XSLForms/XSL/Prepare.xsl
--- a/XSLForms/XSL/Prepare.xsl	Fri Dec 02 13:51:37 2005 +0000
+++ b/XSLForms/XSL/Prepare.xsl	Fri Dec 02 13:52:19 2005 +0000
@@ -41,10 +41,8 @@
         doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" -->
 
       <!-- Include internationalisation (i18n) support if appropriate. -->
-      <xsl:if test="//*[@template:i18n]">
-        <axsl:param name="translations"/>
-        <axsl:param name="locale"/>
-      </xsl:if>
+      <axsl:param name="translations"/>
+      <axsl:param name="locale"/>
 
       <axsl:template match="/">
 
@@ -158,15 +156,6 @@
       <xsl:when test="@template:effect = 'replace'">
         <xsl:call-template name="special-value"/>
       </xsl:when>
-      <xsl:when test="@template:i18n != '' and @template:i18n != '-'">
-        <xsl:copy>
-          <xsl:apply-templates select="@*"/>
-          <xsl:call-template name="translated-values">
-            <xsl:with-param name="values" select="@template:i18n"/>
-          </xsl:call-template>
-          <xsl:call-template name="expression-attributes"/>
-        </xsl:copy>
-      </xsl:when>
       <xsl:otherwise>
         <xsl:copy>
           <xsl:apply-templates select="@*"/>
@@ -192,10 +181,8 @@
         <axsl:value-of select="{@template:value}"/>
       </xsl:when>
       <!-- Insert the translated value. -->
-      <xsl:when test="@template:i18n = '-'">
-        <xsl:call-template name="translated-value">
-          <xsl:with-param name="mode">contents</xsl:with-param>
-        </xsl:call-template>
+      <xsl:when test="@template:i18n">
+        <xsl:call-template name="translated-value"/>
       </xsl:when>
       <!-- Just process the descendants. -->
       <xsl:otherwise>
@@ -210,87 +197,41 @@
 
   <xsl:template match="*[not(@template:if) and not(@template:element) and not(@template:attribute) and not(@template:value) and not(@template:expr) and @template:i18n]">
     <xsl:copy>
-      <xsl:choose>
-        <xsl:when test="@template:i18n = '-'">
-          <xsl:apply-templates select="@*"/>
-          <xsl:call-template name="translated-value">
-            <xsl:with-param name="mode">contents</xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="@*"/>
-          <xsl:call-template name="translated-values">
-            <xsl:with-param name="values" select="@template:i18n"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:apply-templates select="@*"/>
+      <xsl:call-template name="translated-value"/>
     </xsl:copy>
   </xsl:template>
 
-  <xsl:template name="translated-values">
-    <xsl:param name="values"/>
-    <xsl:param name="this-value" select="substring-before($values, ',')"/>
-    <xsl:param name="next-values" select="substring-after($values, ',')"/>
+  <xsl:template name="translated-value">
     <xsl:choose>
-      <xsl:when test="$this-value != ''">
-        <xsl:call-template name="translated-value">
-          <xsl:with-param name="mode">attribute</xsl:with-param>
-          <xsl:with-param name="attribute-name" select="$this-value"/>
-        </xsl:call-template>
-        <xsl:call-template name="translated-values">
-          <xsl:with-param name="values" select="$next-values"/>
-        </xsl:call-template>
+      <!-- Look for a translation of the contents. -->
+      <xsl:when test="@template:i18n = '-'">
+        <!-- NOTE: Quoting not done completely. -->
+        <axsl:variable name="translation"
+          select="$translations/translations/locale[code/@value=$locale]/translation[@value='{text()}']/text()"/>
+        <xsl:call-template name="insert-translated-value"/>
       </xsl:when>
-      <xsl:when test="$values != ''">
-        <xsl:call-template name="translated-value">
-          <xsl:with-param name="mode">attribute</xsl:with-param>
-          <xsl:with-param name="attribute-name" select="$values"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise/>
+      <!-- Look for a named translation. -->
+      <xsl:otherwise>
+        <!-- NOTE: Quoting not done completely. -->
+        <axsl:variable name="translation"
+          select="$translations/translations/locale[code/@value=$locale]/translation[@value='{@template:i18n}']/text()"/>
+        <xsl:call-template name="insert-translated-value"/>
+      </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="translated-value">
-    <xsl:param name="mode"/>
-    <xsl:param name="attribute-name"/>
-    <xsl:choose>
-      <!-- Look for a translation for the contents. -->
-      <xsl:when test="$mode = 'contents'">
-        <!-- NOTE: Quoting not done completely. -->
-        <!-- NOTE: Guard against scoping issues by generating a special name. -->
-        <axsl:variable name="translation-{$attribute-name}"
-          select="$translations/translations/locale[code/@value=$locale]/translation[@value='{text()}']/text()"/>
-        <axsl:choose>
-          <!-- Insert the translated value. -->
-          <axsl:when test="$translation-{$attribute-name}">
-            <axsl:value-of select="$translation-{$attribute-name}"/>
-          </axsl:when>
-          <!-- Otherwise, just process the descendants. -->
-          <axsl:otherwise>
-            <xsl:apply-templates select="node()"/>
-          </axsl:otherwise>
-        </axsl:choose>
-      </xsl:when>
-      <!-- Look for a translation for an attribute. -->
-      <xsl:otherwise>
-        <!-- NOTE: Quoting not done completely. -->
-        <!-- NOTE: Guard against scoping issues by generating a special name. -->
-        <xsl:variable name="attribute-value" select="@*[local-name() = $attribute-name]"/>
-        <axsl:variable name="translation-{$attribute-name}"
-          select="$translations/translations/locale[code/@value=$locale]/translation[@value='{$attribute-value}']/text()"/>
-        <axsl:choose>
-          <!-- Insert the translated value. -->
-          <axsl:when test="$translation-{$attribute-name}">
-            <axsl:attribute name="{$attribute-name}"><axsl:value-of select="$translation-{$attribute-name}"/></axsl:attribute>
-          </axsl:when>
-          <!-- Otherwise, just process the attribute. -->
-          <axsl:otherwise>
-            <axsl:attribute name="{$attribute-name}"><xsl:value-of select="$attribute-value"/></axsl:attribute>
-          </axsl:otherwise>
-        </axsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
+  <xsl:template name="insert-translated-value">
+    <axsl:choose>
+      <!-- Insert the translated value. -->
+      <axsl:when test="$translation">
+        <axsl:value-of select="$translation"/>
+      </axsl:when>
+      <!-- Otherwise, just process the descendants. -->
+      <axsl:otherwise>
+        <xsl:apply-templates select="node()"/>
+      </axsl:otherwise>
+    </axsl:choose>
   </xsl:template>