They now match the order in the documentation in case it matters. Also removed redundant comments.
Signed-off-by: Francois Gouget fgouget@codeweavers.com --- This probably has no impact but intl.cpl is finicky enough that I prefer not to take chances. --- testbot/bin/SetWinLocale | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index d7f795bee..d4dc1c586 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -470,22 +470,9 @@ my @Config = ( " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='true' CopySettingsToSystemAcct='true'/>", " </gs:UserList>", ); -if ($OptLocale) -{ - push @Config, " <!-- user locale: sorting and formatting -->", - " gs:UserLocale", - " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", - " </gs:UserLocale>"; -} -if ($OptSystem) -{ - push @Config, " <!-- system locale -->", - " <gs:SystemLocale Name='$OptSystem'/>"; -} if (defined $CountryId) { - push @Config, " <!-- current location -->", - " gs:LocationPreferences", + push @Config, " gs:LocationPreferences", " <gs:GeoID Value='$CountryId'/>", " </gs:LocationPreferences>"; } @@ -495,10 +482,13 @@ if ($OptMUI) " <gs:MUILanguage Value='$OptMUI'/>", " </gs:MUILanguagePreferences>"; } +if ($OptSystem) +{ + push @Config, " <gs:SystemLocale Name='$OptSystem'/>"; +} if ($KeyboardIds) { - push @Config, " <!-- keyboard -->", - " gs:InputPreferences"; + push @Config, " gs:InputPreferences"; my $Default = " Default='true'"; foreach my $Id (@$KeyboardIds) { @@ -507,6 +497,12 @@ if ($KeyboardIds) } push @Config, " </gs:InputPreferences>"; } +if ($OptLocale) +{ + push @Config, " gs:UserLocale", + " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", + " </gs:UserLocale>"; +} push @Config, "</gs:GlobalizationServices>";