From 8982103eb5aac8652411ce4dc34368819a10f9e9 Mon Sep 17 00:00:00 2001 From: Dmitry Nefedov Date: Sat, 13 Aug 2022 16:23:15 +0300 Subject: [PATCH] Fix for #377 --- .../Sophia.ps1 | 2 +- .../Sophia.ps1 | 2 +- .../Sophia.ps1 | 11 ++++++++++- .../Sophia Script for Windows 10/Sophia.ps1 | 2 +- .../Sophia.ps1 | 12 +++++++++++- .../Sophia Script for Windows 11/Sophia.ps1 | 2 +- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Sophia Script/Sophia Script for Windows 10 LTSC 2019/Sophia.ps1 b/Sophia Script/Sophia Script for Windows 10 LTSC 2019/Sophia.ps1 index fb50c9df..7d9e8d0b 100644 --- a/Sophia Script/Sophia Script for Windows 10 LTSC 2019/Sophia.ps1 +++ b/Sophia Script/Sophia Script for Windows 10 LTSC 2019/Sophia.ps1 @@ -82,7 +82,7 @@ Import-Module -Name $PSScriptRoot\Manifest\Sophia.psd1 -PassThru -Force Remove-Module -Name PolicyFileEditor -Force -ErrorAction Ignore Import-Module -Name $PSScriptRoot\bin\PolicyFileEditor\PolicyFileEditor.psd1 -PassThru -Force -Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +Import-LocalizedData -BindingVariable Global:Localization -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia <# .SYNOPSIS diff --git a/Sophia Script/Sophia Script for Windows 10 LTSC 2021/Sophia.ps1 b/Sophia Script/Sophia Script for Windows 10 LTSC 2021/Sophia.ps1 index a65ad455..6eab4c84 100644 --- a/Sophia Script/Sophia Script for Windows 10 LTSC 2021/Sophia.ps1 +++ b/Sophia Script/Sophia Script for Windows 10 LTSC 2021/Sophia.ps1 @@ -82,7 +82,7 @@ Import-Module -Name $PSScriptRoot\Manifest\Sophia.psd1 -PassThru -Force Remove-Module -Name PolicyFileEditor -Force -ErrorAction Ignore Import-Module -Name $PSScriptRoot\bin\PolicyFileEditor\PolicyFileEditor.psd1 -PassThru -Force -Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +Import-LocalizedData -BindingVariable Global:Localization -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia <# .SYNOPSIS diff --git a/Sophia Script/Sophia Script for Windows 10 PowerShell 7/Sophia.ps1 b/Sophia Script/Sophia Script for Windows 10 PowerShell 7/Sophia.ps1 index 79e6777a..8932e182 100644 --- a/Sophia Script/Sophia Script for Windows 10 PowerShell 7/Sophia.ps1 +++ b/Sophia Script/Sophia Script for Windows 10 PowerShell 7/Sophia.ps1 @@ -82,7 +82,16 @@ Import-Module -Name $PSScriptRoot\Manifest\Sophia.psd1 -PassThru -Force Remove-Module -Name PolicyFileEditor -Force -ErrorAction Ignore Import-Module -Name $PSScriptRoot\bin\PolicyFileEditor\PolicyFileEditor.psd1 -PassThru -Force -Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +# PowerShell 7 doesn't load en-us localization automatically if there is no localization folder in user's language which is determined by $PSUICulture +# https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.utility/import-localizeddata?view=powershell-7.2 +try +{ + Import-LocalizedData -BindingVariable Global:Localization -UICulture $PSUICulture -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia -ErrorAction Stop +} +catch +{ + Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +} <# .SYNOPSIS diff --git a/Sophia Script/Sophia Script for Windows 10/Sophia.ps1 b/Sophia Script/Sophia Script for Windows 10/Sophia.ps1 index fcffebdb..ee5dfb67 100644 --- a/Sophia Script/Sophia Script for Windows 10/Sophia.ps1 +++ b/Sophia Script/Sophia Script for Windows 10/Sophia.ps1 @@ -82,7 +82,7 @@ Import-Module -Name $PSScriptRoot\Manifest\Sophia.psd1 -PassThru -Force Remove-Module -Name PolicyFileEditor -Force -ErrorAction Ignore Import-Module -Name $PSScriptRoot\bin\PolicyFileEditor\PolicyFileEditor.psd1 -PassThru -Force -Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +Import-LocalizedData -BindingVariable Global:Localization -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia <# .SYNOPSIS diff --git a/Sophia Script/Sophia Script for Windows 11 PowerShell 7/Sophia.ps1 b/Sophia Script/Sophia Script for Windows 11 PowerShell 7/Sophia.ps1 index 755251df..4c5dafd5 100644 --- a/Sophia Script/Sophia Script for Windows 11 PowerShell 7/Sophia.ps1 +++ b/Sophia Script/Sophia Script for Windows 11 PowerShell 7/Sophia.ps1 @@ -81,7 +81,17 @@ Import-Module -Name $PSScriptRoot\Manifest\Sophia.psd1 -PassThru -Force Remove-Module -Name PolicyFileEditor -Force -ErrorAction Ignore Import-Module -Name $PSScriptRoot\bin\PolicyFileEditor\PolicyFileEditor.psd1 -PassThru -Force -Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +# PowerShell 7 doesn't load en-us localization automatically if there is no localization folder in user's language which is determined by $PSUICulture +# https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.utility/import-localizeddata?view=powershell-7.2 +try +{ + Import-LocalizedData -BindingVariable Global:Localization -UICulture $PSUICulture -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia -ErrorAction Stop +} +catch +{ + Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +} + <# .SYNOPSIS diff --git a/Sophia Script/Sophia Script for Windows 11/Sophia.ps1 b/Sophia Script/Sophia Script for Windows 11/Sophia.ps1 index 92f992d3..c2a3a7d8 100644 --- a/Sophia Script/Sophia Script for Windows 11/Sophia.ps1 +++ b/Sophia Script/Sophia Script for Windows 11/Sophia.ps1 @@ -81,7 +81,7 @@ Import-Module -Name $PSScriptRoot\Manifest\Sophia.psd1 -PassThru -Force Remove-Module -Name PolicyFileEditor -Force -ErrorAction Ignore Import-Module -Name $PSScriptRoot\bin\PolicyFileEditor\PolicyFileEditor.psd1 -PassThru -Force -Import-LocalizedData -BindingVariable Global:Localization -UICulture en-US -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia +Import-LocalizedData -BindingVariable Global:Localization -BaseDirectory $PSScriptRoot\Localizations -FileName Sophia <# .SYNOPSIS