Module: tools Branch: master Commit: ca35a369c9829a50f3f5f0076f9f961264b27cf9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ca35a369c9829a50f3f5f007... Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 22 17:46:24 2021 +0100 testbot/SetWinLocale: Reorder the intl.cpl's XML file elements. They now match the order in the documentation in case it matters. Also removed redundant comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index c4ca7df..dc969e5 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -486,22 +486,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>"; } @@ -511,10 +498,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) { @@ -523,6 +513,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>";