[yelp-xsl] mal2html-media: Support xml:lang on TTML and unbreak tt:span

[Shaun McCance <shaunm src gnome org>]

commit 0f59420821a618e005eeb292601d48639e4c611b
Author: Shaun McCance <shaunm gnome org>
Date:   Wed Feb 29 16:58:35 2012 -0500

    mal2html-media: Support xml:lang on TTML and unbreak tt:span

 xslt/mallard/html/mal2html-media.xsl |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/xslt/mallard/html/mal2html-media.xsl b/xslt/mallard/html/mal2html-media.xsl
index b5f7020..fe9ccfe 100644
--- a/xslt/mallard/html/mal2html-media.xsl
+++ b/xslt/mallard/html/mal2html-media.xsl
@@ -158,6 +158,9 @@ FIXME
 
 <xsl:template mode="mal2html.ttml.mode" match="tt:body">
   <div class="media-ttml">
+    <xsl:call-template name="html.lang.attrs">
+      <xsl:with-param name="parent" select="../self::tt:tt"/>
+    </xsl:call-template>
     <xsl:apply-templates mode="mal2html.ttml.mode" select="tt:div">
       <xsl:with-param name="range">
         <xsl:call-template name="mal2html.ttml.time.range"/>
@@ -174,6 +177,7 @@ FIXME
     </xsl:call-template>
   </xsl:variable>
   <div class="media-ttml-node media-ttml-div">
+    <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="data-ttml-begin">
       <xsl:value-of select="substring-before($beginend, ',')"/>
     </xsl:attribute>
@@ -210,6 +214,7 @@ FIXME
     </xsl:call-template>
   </xsl:variable>
   <div class="media-ttml-node media-ttml-p">
+    <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="data-ttml-begin">
       <xsl:value-of select="substring-before($beginend, ',')"/>
     </xsl:attribute>
@@ -233,12 +238,16 @@ FIXME
     </xsl:call-template>
   </xsl:variable>
   <span class="media-ttml-node media-ttml-span">
+    <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="data-ttml-begin">
       <xsl:value-of select="substring-before($beginend, ',')"/>
     </xsl:attribute>
-    <xsl:attribute name="data-ttml-end">
-      <xsl:value-of select="substring-after($beginend, ',')"/>
-    </xsl:attribute>
+    <xsl:variable name="end" select="substring-after($beginend, ',')"/>
+    <xsl:if test="$end != 'â'">
+      <xsl:attribute name="data-ttml-end">
+        <xsl:value-of select="substring-after($beginend, ',')"/>
+      </xsl:attribute>
+    </xsl:if>
     <xsl:apply-templates mode="mal2html.inline.mode"/>
   </span>
 </xsl:template>