Skip to content

$PSCulture follows CurrentThread.CurrentCulture #10138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 3 commits into from
Oct 7, 2019
Merged

$PSCulture follows CurrentThread.CurrentCulture #10138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42a3921
$PSCulture follows CurrentThread.CurrentCulture
iSazonov Jul 12, 2019
5928fb9
Use SetVariableForce() and update test
iSazonov Jul 12, 2019
da528d0
Enhance $PSUICulture
iSazonov Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/CultureVariable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public override object Value
get
{
DebuggerCheckVariableRead();
return System.Globalization.CultureInfo.CurrentCulture.Name;
return System.Threading.Thread.CurrentThread.CurrentCulture.Name;
}
}
}
Expand All @@ -52,7 +52,7 @@ public override object Value
get
{
DebuggerCheckVariableRead();
return System.Globalization.CultureInfo.CurrentUICulture.Name;
return System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/SessionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,11 @@ internal void InitializeFixedVariables()

// $PSCulture
v = new PSCultureVariable();
this.GlobalScope.SetVariable(v.Name, v, asValue: false, force: true, this, CommandOrigin.Internal, fastPath: true);
this.GlobalScope.SetVariableForce(v, this);

// $PSUICulture
v = new PSUICultureVariable();
this.GlobalScope.SetVariable(v.Name, v, asValue: false, force: true, this, CommandOrigin.Internal, fastPath: true);
this.GlobalScope.SetVariableForce(v, this);

// $?
v = new QuestionMarkVariable(this.ExecutionContext);
Expand Down
43 changes: 41 additions & 2 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Culture.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,46 @@ Describe "Get-Culture" -Tags "CI" {

Describe "`$PSCulture" -Tags "CI" {

It "Check `$PSCulture value" {
$PSCulture | Should -BeExactly $([System.Globalization.CultureInfo]::CurrentCulture.Name)
It "`$PSCulture is the current thread culture" {
$PSCulture | Should -BeExactly $([System.Threading.Thread]::CurrentThread.CurrentCulture.Name)
}

It "`$PSUICulture is the current thread culture" {
$PSUICulture | Should -BeExactly $([System.Threading.Thread]::CurrentThread.CurrentUICulture.Name)
}

It "`$PSCulture follows the current thread culture" {
$oldCulture = [CultureInfo]::CurrentCulture
$newCulture = "ru-RU"

# Workaround to pass tests locally
if ($oldCulture -eq "ru-RU") {
$newCulture = "fr-FR"
}

try {
[CultureInfo]::currentculture = $newCulture
$PSCulture | Should -BeExactly $newCulture
$PSCulture | Should -BeExactly $([System.Threading.Thread]::CurrentThread.CurrentCulture.Name)
} finally {
[CultureInfo]::CurrentCulture = $oldCulture
}
}

It "`$PSUICulture follows the current thread culture" {
$oldUICulture = [CultureInfo]::CurrentUICulture
$newUICulture = "ru-RU"

if ($oldUICulture -eq "ru-RU") {
$newUICulture = "fr-FR"
}

try {
[CultureInfo]::CurrentUICulture = $newUICulture
$PSUICulture | Should -BeExactly $newUICulture
$PSUICulture | Should -BeExactly $([System.Threading.Thread]::CurrentThread.CurrentUICulture.Name)
} finally {
[CultureInfo]::CurrentUICulture = $oldUICulture
}
}
}