Skip to content

Add Import-LocalizedData implicit Localization fallback #19896

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
SeeminglyScience merged 7 commits into from
Jan 4, 2024
Merged

Add Import-LocalizedData implicit Localization fallback #19896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3204888
Adds culture fallback to Import-LocalizedData
chrisdent-de Jul 4, 2023
d128de8
Only add fallback if current culture is not en-US
chrisdent-de Jul 4, 2023
f30ce04
Pester 4 compatibility
chrisdent-de Jul 6, 2023
b7aa773
Missing param block in It
chrisdent-de Jul 6, 2023
1dc7e81
Missed param block for It
chrisdent-de Jul 6, 2023
2d166b8
Skip UICulture name test for Linux and Mac
chrisdent-de Jul 7, 2023
a0426b9
Removed test fragment
chrisdent-de Jul 11, 2023
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
33 changes: 24 additions & 9 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
Expand Down Expand Up @@ -290,7 +291,7 @@ private string GetFilePath()

fileName = Path.GetFileNameWithoutExtension(fileName);

CultureInfo culture = null;
CultureInfo culture;
if (_uiculture == null)
{
culture = CultureInfo.CurrentUICulture;
Expand All @@ -307,19 +308,33 @@ private string GetFilePath()
}
}

CultureInfo currentCulture = culture;
List<CultureInfo> cultureList = new List<CultureInfo> { culture };
if (_uiculture == null && culture.Name != "en-US")
{
// .NET 4.8 presents en-US as a parent of any current culture when accessed via the CurrentUICulture
// property.
//
// This feature is not present when GetCultureInfo is called, therefore this fallback change only
// applies when the UICulture parameter is not supplied.
cultureList.Add(CultureInfo.GetCultureInfo("en-US"));
}

string filePath;
string fullFileName = fileName + ".psd1";
while (currentCulture != null && !string.IsNullOrEmpty(currentCulture.Name))
foreach (CultureInfo cultureToTest in cultureList)
{
filePath = Path.Combine(dir, currentCulture.Name, fullFileName);

if (File.Exists(filePath))
CultureInfo currentCulture = cultureToTest;
while (currentCulture != null && !string.IsNullOrEmpty(currentCulture.Name))
{
return filePath;
}
filePath = Path.Combine(dir, currentCulture.Name, fullFileName);

currentCulture = currentCulture.Parent;
if (File.Exists(filePath))
{
return filePath;
}

currentCulture = currentCulture.Parent;
}
}

filePath = Path.Combine(dir, fullFileName);
Expand Down
181 changes: 0 additions & 181 deletions test/powershell/Language/Scripting/I18n.Tests.ps1
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions test/powershell/Language/Scripting/I18n.Tests_fallback.psd1
View file
Open in desktop

This file was deleted.

Loading