[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libosinfo] [PATCH 1/2] win7, installer: 'EN-GB' not supported as UI language



Apparently 'EN-GB' is not supported as UI language but only as locale by
win7 installer. Lets override 'EN-GB' to 'EN-US' for UI language so
unattended installation doesn't break on EN-GB locale.

http://www.wincert.net/forum/topic/9550-add-en-gb-language-and-kb-to-autounattend/
http://technet.microsoft.com/library/dd744369%28WS.10%29.aspx
---
 data/install-scripts/windows-unattend.xml | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml
index f3cb7f8..f3030d2 100644
--- a/data/install-scripts/windows-unattend.xml
+++ b/data/install-scripts/windows-unattend.xml
@@ -69,6 +69,17 @@
           </xsl:choose>
         </xsl:template>
 
+        <xsl:template name="ui-language">
+          <xsl:choose>
+            <xsl:when test="config/l10n-language = 'EN-GB'">
+              <xsl:text>EN-US</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="config/l10n-language"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
 	<xsl:template match="/install-script-config">
 	  <unattend xmlns="urn:schemas-microsoft-com:unattend">
 	    <settings pass="windowsPE">
@@ -132,10 +143,10 @@
 		  <xsl:call-template name="arch"/>
 		</xsl:attribute>
 		<SetupUILanguage>
-		  <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage>
+		  <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
 		</SetupUILanguage>
 		<SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale>
-		<UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage>
+		<UILanguage><xsl:call-template name="ui-language"/></UILanguage>
 		<UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale>
 	      </component>
 	    </settings>
@@ -305,6 +316,17 @@
        <xsl:value-of select="substring($hostname, 1, 15)"/>
      </xsl:template>
 
+     <xsl:template name="ui-language">
+       <xsl:choose>
+         <xsl:when test="config/l10n-language = 'EN-GB'">
+           <xsl:text>EN-US</xsl:text>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:value-of select="config/l10n-language"/>
+         </xsl:otherwise>
+       </xsl:choose>
+     </xsl:template>
+
      <xsl:template match="/install-script-config">
       <unattend xmlns="urn:schemas-microsoft-com:unattend">
        <settings pass="windowsPE">
@@ -368,10 +390,10 @@
           <xsl:call-template name="arch"/>
          </xsl:attribute>
          <SetupUILanguage>
-          <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage>
+          <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
          </SetupUILanguage>
          <SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale>
-         <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage>
+         <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
          <UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale>
         </component>
        </settings>
-- 
1.9.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]