<p dir="ltr"><br>
On Nov 27, 2012 1:06 PM, "Zeeshan Ali (Khattak)" <<a href="mailto:zeeshanak@gnome.org">zeeshanak@gnome.org</a>> wrote:<br>
><br>
> From: Fabiano Fidêncio <<a href="mailto:fabiano@fidencio.org">fabiano@fidencio.org</a>><br>
><br>
> The expected format of l10n_language string is the gettext locale names<br>
> standard:<br>
><br>
> <a href="https://www.gnu.org/savannah-checkouts/gnu/gettext/manual/html_node/Locale-Names.html">https://www.gnu.org/savannah-checkouts/gnu/gettext/manual/html_node/Locale-Names.html</a>,<br>
><br>
> While Windows expect this to be in *the* standard format:<br>
><br>
> <a href="http://www.ietf.org/rfc/rfc4646.txt">http://www.ietf.org/rfc/rfc4646.txt</a><br>
><br>
> So we need to translate the language code for windows.<br>
><br>
> Co-author & reviewer: Zeeshan Ali (Khattak) <<a href="mailto:zeeshanak@gnome.org">zeeshanak@gnome.org</a>><br>
> ---<br>
>  data/install-scripts/windows-unattend.xml | 50 ++++++++++++++++++++++++++-----<br>
>  1 file changed, 42 insertions(+), 8 deletions(-)<br>
><br>
> diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml<br>
> index d3b2df5..0901e5b 100644<br>
> --- a/data/install-scripts/windows-unattend.xml<br>
> +++ b/data/install-scripts/windows-unattend.xml<br>
> @@ -32,6 +32,23 @@<br>
>            </xsl:choose><br>
>          </xsl:template><br>
><br>
> +        <xsl:template name="language"><br>
> +          <xsl:variable name="language"><br>
> +            <xsl:value-of select="config/l10n-language"/><br>
> +          </xsl:variable><br>
> +          <xsl:variable name="formatted-language"><br>
> +            <xsl:value-of select="translate($language,'_','-')"/><br>
> +          </xsl:variable><br>
> +          <xsl:choose><br>
> +            <xsl:when test="contains($formatted-language,'.')"><br>
> +              <xsl:value-of select="substring-before($formatted-language,'.')"/><br>
> +            </xsl:when><br>
> +            <xsl:otherwise><br>
> +              <xsl:value-of select="$formatted-language"/><br>
> +            </xsl:otherwise><br>
> +          </xsl:choose><br>
> +        </xsl:template><br>
> +<br>
>         <xsl:template name="arch"><br>
>           <xsl:choose><br>
>             <xsl:when test="count(config/hardware-arch) &gt; 0"><br>
> @@ -99,11 +116,11 @@<br>
>                   <xsl:call-template name="arch"/><br>
>                 </xsl:attribute><br>
>                 <SetupUILanguage><br>
> -                 <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage><br>
> +                 <UILanguage><xsl:call-template name="language"/></UILanguage><br>
>                 </SetupUILanguage><br>
> -               <SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale><br>
> -               <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage><br>
> -               <UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale><br>
> +               <SystemLocale><xsl:call-template name="language"/></SystemLocale><br>
> +               <UILanguage><xsl:call-template name="language"/></UILanguage><br>
> +               <UserLocale><xsl:call-template name="language"/></UserLocale><br>
>               </component><br>
>             </settings><br>
>             <settings pass="oobeSystem"><br>
> @@ -213,6 +230,23 @@<br>
>          </xsl:choose><br>
>        </xsl:template><br>
><br>
> +      <xsl:template name="language"><br>
> +        <xsl:variable name="language"><br>
> +          <xsl:value-of select="config/l10n-language"/><br>
> +        </xsl:variable><br>
> +        <xsl:variable name="formatted-language"><br>
> +          <xsl:value-of select="translate($language,'_','-')"/><br>
> +        </xsl:variable><br>
> +        <xsl:choose><br>
> +          <xsl:when test="contains($formatted-language,'.')"><br>
> +            <xsl:value-of select="substring-before($formatted-language,'.')"/><br>
> +          </xsl:when><br>
> +          <xsl:otherwise><br>
> +            <xsl:value-of select="$formatted-language"/><br>
> +          </xsl:otherwise><br>
> +        </xsl:choose><br>
> +      </xsl:template><br>
> +<br>
>        <xsl:template name="arch"><br>
>         <xsl:choose><br>
>          <xsl:when test="config/hardware-arch = 'x86_64'"><br>
> @@ -283,11 +317,11 @@<br>
>            <xsl:call-template name="arch"/><br>
>           </xsl:attribute><br>
>           <SetupUILanguage><br>
> -          <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage><br>
> +          <UILanguage><xsl:call-template name="language"/></UILanguage><br>
>           </SetupUILanguage><br>
> -         <SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale><br>
> -         <UILanguage><xsl:value-of select="config/l10n-language"/></UILanguage><br>
> -         <UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale><br>
> +         <SystemLocale><xsl:call-template name="language"/></SystemLocale><br>
> +         <UILanguage><xsl:call-template name="language"/></UILanguage><br>
> +         <UserLocale><xsl:call-template name="language"/></UserLocale><br>
>          </component><br>
>         </settings><br>
>         <xsl:if test="os/version &gt; 6.0"><br>
> --<br>
> 1.8.0<br>
><br>
><br></p>
<p dir="ltr">ACK for both patches! _______________________________________________<br>
> virt-tools-list mailing list<br>
> <a href="mailto:virt-tools-list@redhat.com">virt-tools-list@redhat.com</a><br>
> <a href="https://www.redhat.com/mailman/listinfo/virt-tools-list">https://www.redhat.com/mailman/listinfo/virt-tools-list</a></p>