Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

fix(i18n): read the Portuguese region before private-use subtags

BlackSpiritsdbb5ff319930
diff --git a/src/Filee.App/Services/AppLanguages.cs b/src/Filee.App/Services/AppLanguages.cs
index 96f01d93..bee638a6 100644
--- a/src/Filee.App/Services/AppLanguages.cs
+++ b/src/Filee.App/Services/AppLanguages.cs
@@ -32,7 +32,10 @@ internal static class AppLanguages
var parts = normalized.Split('-');
if (!parts[0].Equals("pt", StringComparison.OrdinalIgnoreCase))
return null;
- // A script subtag must not hide Brazil (pt-Latn-BR). Neutral Portuguese and other regions use pt-PT.
- return parts.Skip(1).Any(p => p.Equals("BR", StringComparison.OrdinalIgnoreCase)) ? "pt-BR" : "pt-PT";
+ // The region follows the language and optional script (pt-Latn-BR). Do not mistake an extension or
+ // private-use subtag for a region: pt-PT-x-br still means Portuguese as used in Portugal.
+ var regionIndex = parts.Length > 1 && parts[1].Length == 4 && parts[1].All(char.IsAsciiLetter) ? 2 : 1;
+ return parts.ElementAtOrDefault(regionIndex)?.Equals("BR", StringComparison.OrdinalIgnoreCase) == true
+ ? "pt-BR" : "pt-PT";
}
}
diff --git a/tests/Filee.App.Tests/LocalizationTests.cs b/tests/Filee.App.Tests/LocalizationTests.cs
index 4859ab19..a5a71d6a 100644
--- a/tests/Filee.App.Tests/LocalizationTests.cs
+++ b/tests/Filee.App.Tests/LocalizationTests.cs
@@ -110,6 +110,8 @@ public partial class LocalizationTests
[InlineData("ko")]
[InlineData("ar")]
[InlineData("en")]
+ [InlineData("pt-PT")]
+ [InlineData("pt-BR")]
public void A_chosen_language_is_kept_whatever_the_os_is_in(string chosen) =>
// The OS isn't even asked: the user picked the language in Settings.
Assert.Equal(chosen, LocalizationService.Resolve(chosen, () => throw new InvalidOperationException("asked the OS")));
diff --git a/tests/Filee.App.Tests/PortugueseLocalizationTests.cs b/tests/Filee.App.Tests/PortugueseLocalizationTests.cs
index d2b0c3c2..7dd00551 100644
--- a/tests/Filee.App.Tests/PortugueseLocalizationTests.cs
+++ b/tests/Filee.App.Tests/PortugueseLocalizationTests.cs
@@ -21,6 +21,14 @@ public class PortugueseLocalizationTests
[InlineData("AUTO", "pt-BR", "pt-BR")]
[InlineData("auto", "PT-br", "pt-BR")]
[InlineData("auto", "pt-Latn-BR", "pt-BR")]
+ [InlineData("auto", "pt_BR", "pt-BR")]
+ [InlineData("auto", "pt-PT-x-br", "pt-PT")]
+ [InlineData("auto", "pt-x-br", "pt-PT")]
+ [InlineData("auto", "pt-Latn-PT-x-br", "pt-PT")]
+ [InlineData("auto", "pt-PT-u-ca-gregory-x-br", "pt-PT")]
+ [InlineData("auto", "pt-BR-x-pt", "pt-BR")]
+ [InlineData("auto", "pt-Latn-BR-u-ca-gregory", "pt-BR")]
+ [InlineData("auto", "pt-u-rg-brzzzz", "pt-PT")]
[InlineData("auto", "pt", "pt-PT")]
[InlineData("auto", "pt-AO", "pt-PT")]
[InlineData("auto", "pt-MZ", "pt-PT")]
diff --git a/tests/Filee.Setup.Tests/SetupTextsTests.cs b/tests/Filee.Setup.Tests/SetupTextsTests.cs
index bd85b466..50fdbfc0 100644
--- a/tests/Filee.Setup.Tests/SetupTextsTests.cs
+++ b/tests/Filee.Setup.Tests/SetupTextsTests.cs
@@ -48,6 +48,14 @@ public partial class SetupTextsTests
[InlineData("auto", "pt-BR", "pt-BR")]
[InlineData("auto", "pt-PT", "pt-PT")]
[InlineData("auto", "pt-Latn-BR", "pt-BR")]
+ [InlineData("auto", "pt_BR", "pt-BR")]
+ [InlineData("auto", "pt-PT-x-br", "pt-PT")]
+ [InlineData("auto", "pt-x-br", "pt-PT")]
+ [InlineData("auto", "pt-Latn-PT-x-br", "pt-PT")]
+ [InlineData("auto", "pt-PT-u-ca-gregory-x-br", "pt-PT")]
+ [InlineData("auto", "pt-BR-x-pt", "pt-BR")]
+ [InlineData("auto", "pt-Latn-BR-u-ca-gregory", "pt-BR")]
+ [InlineData("auto", "pt-u-rg-brzzzz", "pt-PT")]
[InlineData("auto", "pt", "pt-PT")]
[InlineData("auto", "pt-AO", "pt-PT")]
[InlineData("pt-PT", "pt-BR", "pt-PT")]