From 10b1faabf09f42c1864482c465661d1543381037 Mon Sep 17 00:00:00 2001
From: Olivier Hallot <olivier.hallot@libreoffice.org>
Date: Sun, 6 May 2018 09:19:59 -0300
Subject: Fix icon path for colibre + screenshot lang

Note, Tip and Warning icon path
Fix screenshot lang path for en-US

Change-Id: Ia8a7c5d396ea4e3d6858ebcde6019d71c43278b0
Reviewed-on: https://gerrit.libreoffice.org/53910
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
---
 help3xsl/online_transform.xsl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'help3xsl')

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 231cf3a241..be99a477d2 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -100,9 +100,9 @@
 <xsl:variable name="linkpostfix" select="''"/>
 
 <!-- images for notes, tips and warnings -->
-<xsl:variable name="note_img" select="concat($img_url_prefix,'helpimg/note.png')"/>
-<xsl:variable name="tip_img" select="concat($img_url_prefix,'helpimg/tip.png')"/>
-<xsl:variable name="warning_img" select="concat($img_url_prefix,'helpimg/warning.png')"/>
+<xsl:variable name="note_img" select="concat($img_url_prefix,'icon-themes/help/note.png')"/>
+<xsl:variable name="tip_img" select="concat($img_url_prefix,'icon-themes/help/tip.png')"/>
+<xsl:variable name="warning_img" select="concat($img_url_prefix,'icon-themes/help/warning.png')"/>
 
 <!--
 #############
@@ -1105,8 +1105,8 @@
     <xsl:choose>
          <xsl:when test="starts-with(@src,'media/screenshots/')">
             <xsl:choose>
-                <xsl:when test="@localize='true'">
-                    <xsl:variable name="tmp0" select="substring-before(@src, '/ui')"/>
+                <xsl:when test="@localize='true' and not($lang='en-US')">
+                    <xsl:variable name="tmp0" select="substring-before(@src, '/ui/')"/>
                     <xsl:variable name="tmp1" select="substring-after(@src, '/ui/')"/>
                     <xsl:variable name="tmp2" select="substring-before($tmp1,'/')"/>
                     <xsl:variable name="tmp3" select="substring-after($tmp1,'/')"/>
-- 
cgit