From 559a45ae3e2c5f32e1a762f6a24ad18b9fd5255c Mon Sep 17 00:00:00 2001
From: Ross <writetoross@gmail.com>
Date: Wed, 8 Feb 2023 13:37:39 +1000
Subject: [PATCH] fix(windows): add remove lang id uses correct kbd

The id node taken from the keyman_keyboardlist.xsl was using the
packgage id name rather than the keyboard id name. This change
corrects that.
---
 windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl b/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl
index d8e90fbef5..79debebe39 100644
--- a/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl
+++ b/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl
@@ -150,7 +150,7 @@
                 <xsl:with-param name="id">add_remove_<xsl:value-of select="id"/></xsl:with-param>
                 <xsl:with-param name="className">kbd_button</xsl:with-param>
                 <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='SKAddremove']"/></xsl:with-param>
-                <xsl:with-param name="command">javascript:showModifyLink('<xsl:value-of select="../../id" />')</xsl:with-param>
+                <xsl:with-param name="command">javascript:showModifyLink('<xsl:value-of select="id" />')</xsl:with-param>
                 <xsl:with-param name="disabled">
                   <xsl:choose>
                     <xsl:when test='loaded'>0</xsl:when>
@@ -382,10 +382,10 @@
 
 
           <div class='modify'>
-            <xsl:attribute name='id'>modify-<xsl:value-of select="../../id" /></xsl:attribute>
+            <xsl:attribute name='id'>modify-<xsl:value-of select="id" /></xsl:attribute>
             <xsl:attribute name="data-name"><xsl:value-of select="name"/></xsl:attribute>
             <div class='modify_back'>
-              <xsl:attribute name="onclick">return hideModifyLink('<xsl:value-of select="../../id" />')</xsl:attribute>
+              <xsl:attribute name="onclick">return hideModifyLink('<xsl:value-of select="id" />')</xsl:attribute>
             </div>
             <div class='modify_popup'>
 
@@ -405,7 +405,7 @@
                   <xsl:call-template name="button">
                     <xsl:with-param name="className">kbd_button</xsl:with-param>
                     <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Close']"/></xsl:with-param>
-                    <xsl:with-param name="onclick">return hideModifyLink('<xsl:value-of select="../../id" />')</xsl:with-param>
+                    <xsl:with-param name="onclick">return hideModifyLink('<xsl:value-of select="id" />')</xsl:with-param>
                   </xsl:call-template>
                 </div>
               </div>