From 2c431242e2a5e3e71e4ffe8cb3e352099b298b93 Mon Sep 17 00:00:00 2001
From: Gaspar Nagy <gaspar.nagy@gmail.com>
Date: Mon, 23 Nov 2009 14:29:52 +0100
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFlocalize=20step=20definition=20report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Reporting/Common/Common.xslt                  |  75 +++++++++++-
 Reporting/Common/GherkinElements.xslt         |  42 ++++++-
 .../NUnitExecutionReportGenerator.cs          |   2 +-
 Reporting/Program.cs                          |   2 +-
 Reporting/ReflectionHelper.cs                 |   8 ++
 .../ReportElements/StepDefinitionReport.cs    |   2 -
 .../StepDefinitionReport.xslt                 | 115 ++++++++++++------
 .../StepDefinitionReportGenerator.cs          |   7 +-
 Reporting/TechTalk.SpecFlow.Reporting.csproj  |   5 +
 Reporting/XsltHelper.cs                       |  34 +++++-
 changelog.txt                                 |   1 +
 11 files changed, 238 insertions(+), 55 deletions(-)

diff --git a/Reporting/Common/Common.xslt b/Reporting/Common/Common.xslt
index 26b8f1458..89d68d6e8 100644
--- a/Reporting/Common/Common.xslt
+++ b/Reporting/Common/Common.xslt
@@ -7,8 +7,57 @@
                 xmlns:sfr="urn:TechTalk:SpecFlow.Report"
                 exclude-result-prefixes="msxsl">
 
+  <xsl:param name="tool-language" select="'en'" />
+  <xsl:param name="base-tool-language" select="substring-before($tool-language, '-')" />
+
   <xsl:include href="GherkinElements.xslt"/>
 
+  <xsl:param name="common-tool-text">
+    <Language code="en">
+      <GeneratedByPre>Generated by SpecFlow at </GeneratedByPre>
+      <GeneratedByPost></GeneratedByPost>
+      <See>see </See>
+      <Show>show</Show>
+      <Hide>hide</Hide>
+      <Copy>copy</Copy>
+    </Language>
+  </xsl:param>
+
+  <xsl:template name="get-common-tool-text">
+    <xsl:param name="text-key" />
+
+    <xsl:call-template name="get-tool-text-base">
+      <xsl:with-param name="text-key" select="$text-key" />
+      <xsl:with-param name="local-tool-texts" select="msxsl:node-set($common-tool-text)" />
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="get-tool-text-base">
+    <xsl:param name="text-key" />
+    <xsl:param name="local-tool-texts" />
+
+    <xsl:choose>
+      <xsl:when test="$local-tool-texts//Language[@code = $tool-language]">
+        <xsl:value-of select="$local-tool-texts//Language[@code = $tool-language]/node()[local-name() = $text-key]"/>
+      </xsl:when>
+      <xsl:when test="$local-tool-texts//Language[@code = $base-tool-language]">
+        <xsl:value-of select="$local-tool-texts//Language[@code = $base-tool-language]/node()[local-name() = $text-key]"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$local-tool-texts//Language[@code = 'en']/node()[local-name() = $text-key]"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="sfr:ScenarioStep" priority="-0.1" mode="clipboardCopy">
+    <xsl:variable name="step-id" select="generate-id()" />
+    
+    <xsl:text> </xsl:text>
+    <a href="#" onclick="copyStepToClipboard('{$step-id}'); return false;" class="button">[<xsl:call-template name="get-common-tool-text">
+      <xsl:with-param name="text-key" select="'Copy'" />
+    </xsl:call-template>]</a>
+  </xsl:template>
+
   <xsl:template name="html-common-header">
     <xsl:param name="title" />
 
@@ -137,18 +186,24 @@
       }
       ]]></style>
     <script>
+      var showButtonText = "[<xsl:call-template name="get-common-tool-text">
+      <xsl:with-param name="text-key" select="'Show'" />
+    </xsl:call-template>]";
+      var hideButtonText = "[<xsl:call-template name="get-common-tool-text">
+      <xsl:with-param name="text-key" select="'Hide'" />
+    </xsl:call-template>]";
       <![CDATA[
           function toggle(sdid){
             e=window.event.srcElement;
             toToggle=document.getElementById(sdid);
-            if (e.innerText=="[show]")
+            if (e.innerText==showButtonText)
             {
-              e.innerText="[hide]";
+              e.innerText=hideButtonText;
               toToggle.style.display="block";
             }
             else
             {
-              e.innerText="[show]";
+              e.innerText=showButtonText;
               toToggle.style.display="none";
             }
           }
@@ -226,8 +281,18 @@
     <h1>
       <xsl:value-of select="$title"/>
     </h1>
-    
-    Generated by SpecFlow at <xsl:value-of select="$generatedAt"/> (see <a href="http://www.specflow.org/">http://www.specflow.org/</a>).
 
+    <xsl:call-template name="get-common-tool-text">
+      <xsl:with-param name="text-key" select="'GeneratedByPre'" />
+    </xsl:call-template>
+    <xsl:value-of select="$generatedAt"/>
+    <xsl:call-template name="get-common-tool-text">
+      <xsl:with-param name="text-key" select="'GeneratedByPost'" />
+    </xsl:call-template>
+    <xsl:text> (</xsl:text>
+    <xsl:call-template name="get-common-tool-text">
+      <xsl:with-param name="text-key" select="'See'" />
+    </xsl:call-template>
+    <a href="http://www.specflow.org/">http://www.specflow.org/</a>).
   </xsl:template>
 </xsl:stylesheet>
diff --git a/Reporting/Common/GherkinElements.xslt b/Reporting/Common/GherkinElements.xslt
index 5aea4ba82..f1c0ebc41 100644
--- a/Reporting/Common/GherkinElements.xslt
+++ b/Reporting/Common/GherkinElements.xslt
@@ -7,22 +7,58 @@
                 xmlns:sfr="urn:TechTalk:SpecFlow.Report"
                 exclude-result-prefixes="msxsl">
 
+  <xsl:param name="feature-language" select="'en'" />
+  <xsl:param name="languages" select="document('Languages.xml')" />
+
+  <xsl:template name="get-keyword">
+    <xsl:param name="keyword" />
+    <xsl:param name="language">
+      <xsl:choose>
+        <xsl:when test="ancestor::sfr:Feature[1]/sfr:Language">
+          <xsl:value-of select="ancestor::sfr:Feature[1]/sfr:Language"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$feature-language" />
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:param>
+
+    <xsl:variable name="local-keyword">
+      <xsl:choose>
+        <xsl:when test="$languages//Language[@code = $language]">
+          <xsl:value-of select="$languages//Language[@code = $language]/node()[local-name() = $keyword]"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:variable name="base-language" select="substring-before($language, '-')" />
+          <xsl:value-of select="$languages//Language[@code = $base-language]/node()[local-name() = $keyword]"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:value-of select="$local-keyword"/>
+  </xsl:template>
+
   <xsl:template match="sfr:ScenarioStep">
     <xsl:variable name="step-id" select="generate-id()" />
     <xsl:variable name="step-keyword" select="@xsi:type" />
     <span id="txt{$step-id}">
       <span class="stepKeyword">
-        <xsl:value-of select="$step-keyword"/>
+        <xsl:call-template name="get-keyword">
+          <xsl:with-param name="keyword" select="$step-keyword" />
+        </xsl:call-template>
       </span>
       <xsl:text> </xsl:text>
       <xsl:apply-templates select="sfr:Text" />
     </span>
-    <xsl:text> </xsl:text>
-    <a href="#" onclick="copyStepToClipboard('{$step-id}'); return false;" class="button">[copy]</a>
+    <xsl:apply-templates select="." mode="clipboardCopy"/>
     <xsl:apply-templates select="sfr:TableArg" />
     <xsl:apply-templates select="sfr:MultiLineTextArgument" />
   </xsl:template>
 
+  <xsl:template match="sfr:ScenarioStep" priority="-0.5" mode="clipboardCopy">
+    <!-- nop -->
+  </xsl:template>
+
   <xsl:template match="sfr:Text" priority="-0.1">
     <xsl:value-of select="string(node())"/>
   </xsl:template>
diff --git a/Reporting/NUnitExecutionReport/NUnitExecutionReportGenerator.cs b/Reporting/NUnitExecutionReport/NUnitExecutionReportGenerator.cs
index f67fec952..12e457247 100644
--- a/Reporting/NUnitExecutionReport/NUnitExecutionReportGenerator.cs
+++ b/Reporting/NUnitExecutionReport/NUnitExecutionReportGenerator.cs
@@ -94,7 +94,7 @@ public void TransformReport(string outputFilePath)
             }
             else
             {
-                XsltHelper.TransformHtml(serializer, report, GetType(), outputFilePath);
+                XsltHelper.TransformHtml(serializer, report, GetType(), outputFilePath, specFlowProject.GeneratorConfiguration);
             }
         }
     }
diff --git a/Reporting/Program.cs b/Reporting/Program.cs
index dfc268769..901572807 100644
--- a/Reporting/Program.cs
+++ b/Reporting/Program.cs
@@ -32,7 +32,7 @@ public static void StepDefinitionReport(
             List<BindingInfo> bindings = BindingCollector.CollectBindings(specFlowProject, basePath);
 
             StepDefinitionReportGenerator generator = new StepDefinitionReportGenerator(specFlowProject, bindings, parsedFeatures, 
-                true, false);
+                true);
             generator.GenerateReport();
 
             string outputFilePath = Path.GetFullPath(outputFile);
diff --git a/Reporting/ReflectionHelper.cs b/Reporting/ReflectionHelper.cs
index 02dcc3cd9..0f2f0e09e 100644
--- a/Reporting/ReflectionHelper.cs
+++ b/Reporting/ReflectionHelper.cs
@@ -1,3 +1,6 @@
+using System;
+using System.Reflection;
+
 namespace TechTalk.SpecFlow.Reporting
 {
     static class ReflectionHelper
@@ -6,5 +9,10 @@ public static T GetProperty<T>(this object source, string propertyName)
         {
             return (T)source.GetType().GetProperty(propertyName).GetValue(source, null);
         }
+
+        public static void PreserveStackTrace(this Exception ex)
+        {
+            typeof(Exception).GetMethod("InternalPreserveStackTrace", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(ex, new object[0]);
+        }
     }
 }
\ No newline at end of file
diff --git a/Reporting/StepDefinitionReport/ReportElements/StepDefinitionReport.cs b/Reporting/StepDefinitionReport/ReportElements/StepDefinitionReport.cs
index f1a3a09a8..6042d3cf7 100644
--- a/Reporting/StepDefinitionReport/ReportElements/StepDefinitionReport.cs
+++ b/Reporting/StepDefinitionReport/ReportElements/StepDefinitionReport.cs
@@ -16,8 +16,6 @@ public class StepDefinitionReport
         public string GeneratedAt;
         [XmlAttribute("showBindingsWithoutInsance")]
         public bool ShowBindingsWithoutInsance;
-        [XmlAttribute("onlySelectedFeatures")]
-        public bool OnlySelectedFeatures;
 
         [XmlElement("StepDefinition")]
         public List<StepDefinition> StepDefinitions = new List<StepDefinition>();
diff --git a/Reporting/StepDefinitionReport/StepDefinitionReport.xslt b/Reporting/StepDefinitionReport/StepDefinitionReport.xslt
index aa24b9369..abc9cb44b 100644
--- a/Reporting/StepDefinitionReport/StepDefinitionReport.xslt
+++ b/Reporting/StepDefinitionReport/StepDefinitionReport.xslt
@@ -9,17 +9,46 @@
 
   <xsl:include href="..\Common\Common.xslt"/>
 
+  <xsl:param name="tool-text">
+    <Language code="en">
+      <Title>Step Definition Report</Title>
+      <Givens>Givens</Givens>
+      <Whens>Whens</Whens>
+      <Thens>Thens</Thens>
+      <StepDefinition>Step Definition</StepDefinition>
+      <Instances>Instances</Instances>
+      <BindingsWithoutInstancesMessage>Bindings without instances are not included in this report.</BindingsWithoutInstancesMessage>
+      <ParameterValuesPre>Used values for parameter </ParameterValuesPre>
+      <ParameterValuesPost>:</ParameterValuesPost>
+      <ScenarioOutlineExampleMessage>(scenario outline example)</ScenarioOutlineExampleMessage>
+    </Language>
+  </xsl:param>
+
   <xsl:template match="@* | node()">
     <xsl:copy>
       <xsl:apply-templates select="@* | node()"/>
     </xsl:copy>
   </xsl:template>
 
+  <xsl:template name="get-tool-text">
+    <xsl:param name="text-key" />
+
+    <xsl:call-template name="get-tool-text-base">
+      <xsl:with-param name="text-key" select="$text-key" />
+      <xsl:with-param name="local-tool-texts" select="msxsl:node-set($tool-text)" />
+    </xsl:call-template>
+  </xsl:template>
+
+
   <xsl:key name="step-usage-variation" match="sfr:Instance" use="normalize-space(string(sfr:ScenarioStep))"/>
 
   <xsl:template match="/">
     <xsl:variable name="title">
-      <xsl:value-of select="sfr:StepDefinitionReport/@projectName"/> Step Definition Report
+      <xsl:call-template name="get-tool-text">
+        <xsl:with-param name="text-key" select="'Title'" />
+      </xsl:call-template>
+      <xsl:text> - </xsl:text>
+      <xsl:value-of select="sfr:StepDefinitionReport/@projectName"/>
     </xsl:variable>
     <html>
       <head>
@@ -49,44 +78,34 @@
         <xsl:call-template name="html-body-header">
           <xsl:with-param name="title" select="$title" />
         </xsl:call-template>
-        <xsl:if test="(/sfr:StepDefinitionReport/@onlySelectedFeatures='true')">
-          <div class="legend">
-            Only the following features from the project are included in this report:
-            <xsl:variable name="featureRefs">
-              <FeatureRefs>
-                <xsl:for-each select="//sfr:FeatureRef">
-                  <FeatureName>
-                    <xsl:value-of select="@name"/>
-                  </FeatureName>
-                </xsl:for-each>
-              </FeatureRefs>
-            </xsl:variable>
-            <ul>
-            <xsl:for-each select="msxsl:node-set($featureRefs)/*/*">
-              <xsl:variable name="feature-name" select="string(text())" />
-              <xsl:if test="not(preceding-sibling::FeatureName[string(text())=$feature-name])">
-                <li>
-                  <xsl:value-of select="$feature-name"/>
-                </li>
-              </xsl:if>
-            </xsl:for-each>
-            </ul>
-          </div>
-        </xsl:if>        
         <xsl:if test="(/sfr:StepDefinitionReport/@showBindingsWithoutInsance!='true')">
           <div class="legend">
-            Bindings without instances are not included in this report.
+            <xsl:call-template name="get-tool-text">
+              <xsl:with-param name="text-key" select="'BindingsWithoutInstancesMessage'" />
+            </xsl:call-template>
           </div>
         </xsl:if>        
-        <h2>Givens</h2>
+        <h2>
+          <xsl:call-template name="get-tool-text">
+            <xsl:with-param name="text-key" select="'Givens'" />
+          </xsl:call-template>
+        </h2>
         <xsl:call-template name="process-block">
           <xsl:with-param name="block-name" select="'Given'" />
         </xsl:call-template>
-        <h2>Whens</h2>
+        <h2>
+          <xsl:call-template name="get-tool-text">
+            <xsl:with-param name="text-key" select="'Whens'" />
+          </xsl:call-template>
+        </h2>
         <xsl:call-template name="process-block">
           <xsl:with-param name="block-name" select="'When'" />
         </xsl:call-template>
-        <h2>Thens</h2>
+        <h2>
+          <xsl:call-template name="get-tool-text">
+            <xsl:with-param name="text-key" select="'Thens'" />
+          </xsl:call-template>
+        </h2>
         <xsl:call-template name="process-block">
           <xsl:with-param name="block-name" select="'Then'" />
         </xsl:call-template>
@@ -99,8 +118,16 @@
 
     <table class="reportTable" cellpadding="0" cellspacing="0">
       <tr>
-        <th class="top left">Step Definition</th>
-        <th class="top">Instances</th>
+        <th class="top left">
+          <xsl:call-template name="get-tool-text">
+            <xsl:with-param name="text-key" select="'StepDefinition'" />
+          </xsl:call-template>
+        </th>
+        <th class="top">
+          <xsl:call-template name="get-tool-text">
+            <xsl:with-param name="text-key" select="'Instances'" />
+          </xsl:call-template>
+        </th>
       </tr>
       <xsl:for-each select="sfr:StepDefinitionReport/sfr:StepDefinition[@type=$block-name]">
         <xsl:sort order="ascending" select="sfr:ScenarioStep/sfr:Text" data-type="text"/>
@@ -121,7 +148,9 @@
               <xsl:value-of select="count(./sfr:Instances/sfr:Instance)"/>
               <xsl:if test="sfr:Instances">
                 <xsl:text> </xsl:text>
-                <a href="#" onclick="toggle('{$stepdef-id}'); return false;" class="button">[show]</a>
+                <a href="#" onclick="toggle('{$stepdef-id}'); return false;" class="button">[<xsl:call-template name="get-common-tool-text">
+                  <xsl:with-param name="text-key" select="'Show'" />
+                </xsl:call-template>]</a>
               </xsl:if>
             </td>
           </tr>
@@ -130,7 +159,12 @@
               <td class="left" colspan="2">
                 <table class="subReportTable" cellpadding="0" cellspacing="0">
                   <tr>
-                    <th class="top left">Instances:</th>
+                    <th class="top left">
+                      <xsl:call-template name="get-tool-text">
+                        <xsl:with-param name="text-key" select="'Instances'" />
+                      </xsl:call-template>
+                      <xsl:text>:</xsl:text>
+                    </th>
                   </tr>
                   <xsl:for-each select="sfr:Instances/sfr:Instance">
                     <xsl:variable name="current-key" select="normalize-space(string(sfr:ScenarioStep))" />
@@ -164,7 +198,10 @@
         <xsl:text> / </xsl:text>
         <xsl:value-of select="sfr:ScenarioRef/@name"/>
         <xsl:if test="@fromScenarioOutline = 'true'">
-          <xsl:text> (scenario outline example)</xsl:text>
+          <xsl:text> </xsl:text>
+          <xsl:call-template name="get-tool-text">
+            <xsl:with-param name="text-key" select="'ScenarioOutlineExampleMessage'" />
+          </xsl:call-template>
         </xsl:if>
       </a>
     </b>
@@ -187,7 +224,15 @@
 
     </xsl:variable>
     <xsl:variable name="param-values">
-      <xsl:text>Used values for parameter '</xsl:text><xsl:value-of select="$param-name"/>'<xsl:text>:
+      <xsl:call-template name="get-tool-text">
+        <xsl:with-param name="text-key" select="'ParameterValuesPre'" />
+      </xsl:call-template>
+      <xsl:text>'</xsl:text><xsl:value-of select="$param-name"/>
+      <xsl:text>'</xsl:text>
+      <xsl:call-template name="get-tool-text">
+        <xsl:with-param name="text-key" select="'ParameterValuesPost'" />
+      </xsl:call-template>
+      <xsl:text>
 </xsl:text>
       <xsl:for-each select="$instances-root/sfr:Instance/sfr:Parameters/sfr:Parameter[@name=$param-name]">
         <xsl:variable name="param-value" select="string(text())" />
diff --git a/Reporting/StepDefinitionReport/StepDefinitionReportGenerator.cs b/Reporting/StepDefinitionReport/StepDefinitionReportGenerator.cs
index 496f2b5cd..7943dcc65 100644
--- a/Reporting/StepDefinitionReport/StepDefinitionReportGenerator.cs
+++ b/Reporting/StepDefinitionReport/StepDefinitionReportGenerator.cs
@@ -20,7 +20,6 @@ internal class StepDefinitionReportGenerator
         private readonly SpecFlowProject specFlowProject;
         private readonly List<BindingInfo> bindings;
         private readonly List<Feature> parsedFeatures;
-        private readonly bool onlySelectedFeatures;
         private readonly bool showBindingsWithoutInsance;
 
         private ReportElements.StepDefinitionReport report;
@@ -28,10 +27,9 @@ internal class StepDefinitionReportGenerator
         private Dictionary<StepDefinition, BindingInfo> bindingByStepDef;
         private readonly List<StepDefinition> stepDefsWithNoBinding = new List<StepDefinition>();
 
-        public StepDefinitionReportGenerator(SpecFlowProject specFlowProject, List<BindingInfo> bindings, List<Feature> parsedFeatures, bool showBindingsWithoutInsance, bool onlySelectedFeatures)
+        public StepDefinitionReportGenerator(SpecFlowProject specFlowProject, List<BindingInfo> bindings, List<Feature> parsedFeatures, bool showBindingsWithoutInsance)
         {
             this.specFlowProject = specFlowProject;
-            this.onlySelectedFeatures = onlySelectedFeatures;
             this.showBindingsWithoutInsance = showBindingsWithoutInsance;
             this.bindings = bindings;
             this.parsedFeatures = parsedFeatures;
@@ -43,7 +41,6 @@ public ReportElements.StepDefinitionReport GenerateReport()
             report.ProjectName = specFlowProject.ProjectName;
             report.GeneratedAt = DateTime.Now.ToString("g", CultureInfo.InvariantCulture);
             report.ShowBindingsWithoutInsance = showBindingsWithoutInsance;
-            report.OnlySelectedFeatures = onlySelectedFeatures;
 
             stepDefByBinding = new Dictionary<BindingInfo, StepDefinition>();
             bindingByStepDef = new Dictionary<StepDefinition, BindingInfo>();
@@ -216,7 +213,7 @@ public void TransformReport(string outputFilePath)
             }
             else
             {
-                XsltHelper.TransformHtml(serializer, report, GetType(), outputFilePath);
+                XsltHelper.TransformHtml(serializer, report, GetType(), outputFilePath, specFlowProject.GeneratorConfiguration);
             }
         }
 
diff --git a/Reporting/TechTalk.SpecFlow.Reporting.csproj b/Reporting/TechTalk.SpecFlow.Reporting.csproj
index f1cacce46..05414d031 100644
--- a/Reporting/TechTalk.SpecFlow.Reporting.csproj
+++ b/Reporting/TechTalk.SpecFlow.Reporting.csproj
@@ -94,6 +94,11 @@
       <Name>TechTalk.SpecFlow.Parser</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Languages.xml">
+      <Link>Common\Languages.xml</Link>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Reporting/XsltHelper.cs b/Reporting/XsltHelper.cs
index 4bf8a792a..f3d45536a 100644
--- a/Reporting/XsltHelper.cs
+++ b/Reporting/XsltHelper.cs
@@ -1,10 +1,12 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 using System.Xml.Xsl;
+using TechTalk.SpecFlow.Parser.Configuration;
 
 namespace TechTalk.SpecFlow.Reporting
 {
@@ -25,25 +27,51 @@ public static void TransformXml(XmlSerializer serializer, object report, string
             }
         }
 
-        public static void TransformHtml(XmlSerializer serializer, object report, Type reportType, string outputFilePath)
+        public static void TransformHtml(XmlSerializer serializer, object report, Type reportType, string outputFilePath, GeneratorConfiguration generatorConfiguration)
         {
             var xmlOutputWriter = new StringWriter();
             serializer.Serialize(xmlOutputWriter, report);
 
             XslCompiledTransform xslt = new XslCompiledTransform();
+
+            var xsltSettings = new XsltSettings(true, false);
+            var resourceResolver = new XmlResourceResolver();
+
             var reportName = reportType.Name.Replace("Generator", "");
             using (var xsltReader = new ResourceXmlReader(reportType, reportName + ".xslt"))
             {
-                xslt.Load(xsltReader, null, new XmlResourceResolver());
+                xslt.Load(xsltReader, xsltSettings, resourceResolver);
             }
 
             var xmlOutputReader = new XmlTextReader(new StringReader(xmlOutputWriter.ToString()));
 
             XsltArgumentList argumentList = new XsltArgumentList();
+            argumentList.AddParam("feature-language", "", generatorConfiguration.FeatureLanguage.Name);
+            argumentList.AddParam("tool-language", "", generatorConfiguration.ToolLanguage.Name);
             using (var outFileStream = new FileStream(outputFilePath, FileMode.Create, FileAccess.Write))
             {
-                xslt.Transform(xmlOutputReader, argumentList, outFileStream);
+                xslt.Transform(xmlOutputReader, argumentList, outFileStream, resourceResolver);
             }            
         }
+
+        static public void Transform(this XslCompiledTransform xslt, XmlReader input, XsltArgumentList arguments, Stream results, XmlResolver documentResolver)
+        {
+            //xslt.command.Execute(input, new XmlUrlResolver(), arguments, results);
+
+            var command = xslt.GetType().GetField("command", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(xslt);
+
+            var executeMethod = command.GetType().GetMethod("Execute", new Type[] { typeof(XmlReader), typeof(XmlResolver), typeof(XsltArgumentList), typeof(Stream) });
+
+            try
+            {
+                executeMethod.Invoke(command, new object[] {input, documentResolver, arguments, results});
+            }
+            catch (TargetInvocationException invEx)
+            {
+                var ex = invEx.InnerException;
+                ex.PreserveStackTrace();
+                throw ex;
+            }
+        }
     }
 }
diff --git a/changelog.txt b/changelog.txt
index c47fd29f1..ebec93733 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@ New features:
 
 Fixed issues:
 + MsTest does not refresh tests automatically (Issue 25)
++ Fixes in report localization
 
 1.1.0 - 2009/11/11