Francois Gouget : testbot: The locale modifier must come after the codeset.
Alexandre Julliard
julliard at winehq.org
Fri Nov 23 14:01:05 CST 2018
Module: tools
Branch: master
Commit: b7d1d31ffa1006aa87d1296251b1436cde75345e
URL: https://source.winehq.org/git/tools.git/?a=commit;h=b7d1d31ffa1006aa87d1296251b1436cde75345e
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Fri Nov 23 16:22:09 2018 +0100
testbot: The locale modifier must come after the codeset.
This fixes SetupWineEnvironment() so it adds the default '.UTF-8' in the
right place.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/Build/Utils.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index 4dda8d5..0f1ddb0 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -337,7 +337,7 @@ sub SetupWineEnvironment($)
my $Lang = $Mission->{lang} || "en_US";
if ($Lang =~ /^[a-zA-Z0-9\@_.-]+$/)
{
- $Lang .= ".UTF-8" if ($Lang !~ /\./);
+ $Lang =~ s/(@[a-z]*$|$)/.UTF-8$1/ if ($Lang !~ /\./);
$ENV{LANG} = $Lang;
}
More information about the wine-cvs
mailing list