X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/0bfcdd22bd1ff2f2f1ea4e7cdec2fb8c9a5a79b2..82881272e23e07a492a35ce13258da09069e8c59:/rss_converter_instagram.com.xsl

diff --git a/rss_converter_instagram.com.xsl b/rss_converter_instagram.com.xsl
index 4f1d14f..5ce83dd 100644
--- a/rss_converter_instagram.com.xsl
+++ b/rss_converter_instagram.com.xsl
@@ -46,15 +46,16 @@
         <item>
             <title>
                 <xsl:variable name="title-length" select="140"/>
+                <xsl:variable name="item-content-title" select="normalize-space(concat($user-name, ': ', $item-content-caption))"/>
                 <!-- ellipsize, inspired from http://stackoverflow.com/questions/13622338 -->
                 <xsl:choose>
-                    <xsl:when test="string-length($item-content-caption) > $title-length">
+                    <xsl:when test="string-length($item-content-title) > $title-length">
                         <xsl:variable name="truncated-length" select="$title-length - 3"/>
-                        <xsl:value-of select="normalize-space(substring($item-content-caption, 1, $truncated-length))"/>
+                        <xsl:value-of select="substring($item-content-title, 1, $truncated-length)"/>
                         <xsl:text>...</xsl:text>
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:value-of select="normalize-space($item-content-caption)"/>
+                        <xsl:value-of select="$item-content-title"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </title>
@@ -100,7 +101,13 @@
                     <xsl:value-of select="$channel-link"/>
                 </link>
                 <description>
-                    <xsl:value-of select="//user/biography"/>
+                    <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
+                    <xsl:value-of select="normalize-space(concat($screen-name, '. ', //user/biography))"/>
+                    <xsl:variable name="external-url" select="//user/external_url"/>
+                    <xsl:if test="$external-url != ''">
+                        <xsl:text> </xsl:text><a href="{$external-url}"><xsl:value-of select="$external-url"/></a>
+                    </xsl:if>
+                    <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
                 </description>
                 <image>
                     <title>