[Libosinfo] [PATCH v5 12/14] installer: Use l10n-language as UI language

[Fabiano Fidêncio]

Since commit 57b459e09 we set 'EN-US' as UI language instead of 'EN-GB'.
However, this hack is only necessary for Windows 7 and can cause issues
when installing newer versions of the Windows, as the installer,
somehow, gets confused by having different values set to UI language,
System Locale and User Locale and ends up prompting a window for letting
the user to set these values.
Simply by limiting the hack the hack to Windws 7 fixes the installation
of 'EN-GB' ISOs of Windows 8 and 8.1 (the ones tested for now).

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../microsoft.com/windows-unattend-desktop.xml.in      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
index 0bc1aeb..310246f 100644
--- a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
@@ -170,10 +170,24 @@
           <xsl:call-template name="arch"/>
          </xsl:attribute>
          <SetupUILanguage>
-          <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+          <xsl:choose>
+           <xsl:when test="os/version = 6.1">
+            <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+           </xsl:when>
+           <xsl:otherwise>
+            <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage>
+           </xsl:otherwise>
+          </xsl:choose>
          </SetupUILanguage>
          <SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale>
-         <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+         <xsl:choose>
+          <xsl:when test="os/version = 6.1">
+           <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+          </xsl:when>
+          <xsl:otherwise>
+           <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage>
+          </xsl:otherwise>
+         </xsl:choose>
          <UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale>
         </component>
        </settings>
-- 
2.7.3