Don't include lang in manpages filename/pathname if lang=en (that

is, only generate lang-qualified file-/pathnames for non-English).

diff --git a/xsl/manpages/utility.xsl b/xsl/manpages/utility.xsl
index 249efcbb092290baa2bd4f89b9c8b7780bca3da9..23bc7a2d99094a150905f51c3b7b0c477f15559f 100644 (file)
--- a/xsl/manpages/utility.xsl
+++ b/xsl/manpages/utility.xsl
@@ -371,12 +371,14 @@
     <xsl:param name="lang"/>
     <xsl:param name="name.with.lang">
       <xsl:choose>
-        <xsl:when test="not($man.output.lang.in.name.enabled = 0)
+        <xsl:when test="$lang != 'en'
+          and not($man.output.lang.in.name.enabled = 0)
           and ($man.output.subdirs.enabled = 0 or
           $man.output.in.separate.dir = 0)">
-          <!-- * user has specified man.output.lang.in.name.enabled -->
+          <!-- * $lang is not en (English) -->
+          <!-- * AND user has specified man.output.lang.in.name.enabled -->
           <!-- * AND doesn't want output going into separate dirs, -->
-          <!-- * so we include the $lang value in the filename; e.g., -->
+          <!-- * SO... we include the $lang value in the filename; e.g., -->
           <!-- * foo.ja.1 -->
           <xsl:value-of select="concat($name, '.', $lang)"/>
         </xsl:when>