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.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
merge: retain Portuguese variants alongside French and Traditional Chinese
BlackSpirits1210260dad7a
diff --cc installer/macos/Info.plistindex b7f45cb2,36e2139d..734b78b9--- a/installer/macos/Info.plist+++ b/installer/macos/Info.plist@@@ -3,7 -3,7 +3,7 @@@<plist version="1.0"><dict><key>CFBundleDevelopmentRegion</key><string>en</string>- <key>CFBundleLocalizations</key><array><string>en</string><string>ko</string><string>zh-Hans</string><string>pt-PT</string><string>pt-BR</string></array>- <key>CFBundleLocalizations</key><array><string>en</string><string>ko</string><string>zh-Hans</string><string>zh-Hant</string></array>++ <key>CFBundleLocalizations</key><array><string>en</string><string>ko</string><string>zh-Hans</string><string>zh-Hant</string><string>pt-PT</string><string>pt-BR</string></array><key>CFBundleIdentifier</key><string>com.filee.app</string><key>CFBundleName</key><string>Filee</string><key>CFBundleDisplayName</key><string>Filee</string>diff --cc src/Filee.App/Services/AppLanguages.csindex bee638a6,46eb9f09..4c4e14e1--- a/src/Filee.App/Services/AppLanguages.cs+++ b/src/Filee.App/Services/AppLanguages.cs@@@ -17,25 -18,22 +18,41 @@@ internal static class AppLanguage("hi", "हिन्दी"),("ru", "Русский"),("ar", "العربية"),+ ("pt-PT", "Português (Portugal)"),("pt-BR", "Português (Brasil)"),+ ("fr", "Français"),];+ /// <summary>Shared Portuguese region policy for the app and Setup, including legacy Inno language codes.</summary>+ public static string? PortugueseVariant(string name)+ {+ var normalized = name.Trim().Replace('_', '-');+ if (normalized.Equals("ptpt", StringComparison.OrdinalIgnoreCase))+ return "pt-PT";+ if (normalized.Equals("ptbr", StringComparison.OrdinalIgnoreCase))+ return "pt-BR";+ var parts = normalized.Split('-');+ if (!parts[0].Equals("pt", StringComparison.OrdinalIgnoreCase))+ return null;+ // 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";+ }+++ /// <summary>+ /// True for a Chinese culture name written in Traditional characters: "zh-TW", "zh-HK", "zh-Hant-TW", "zh-CHT" …+ /// An explicit script wins over the region (macOS has "zh-Hans-TW", Simplified in Taiwan); a bare "zh" is Simplified.+ /// </summary>+ public static bool IsTraditionalChinese(string culture)+ {+ var parts = culture.Trim().Replace('_', '-').Split('-');+ if (!parts[0].Equals("zh", StringComparison.OrdinalIgnoreCase))+ return false;+ var rest = parts.Skip(1).ToArray();+ if (rest.Contains("Hans", StringComparer.OrdinalIgnoreCase))+ return false;+ return rest.Intersect(["Hant", "TW", "HK", "MO", "CHT"], StringComparer.OrdinalIgnoreCase).Any();+ }}diff --cc src/Filee.App/Services/LocalizationService.csindex 3852d7d9,55cd1495..3c190172--- a/src/Filee.App/Services/LocalizationService.cs+++ b/src/Filee.App/Services/LocalizationService.cs@@@ -125,6 -123,12 +125,9 @@@ public sealed class LocalizationServic// "ar" and every region ("ar-SA", "ar-EG", …), but not other codes starting with "ar".if (ui.Equals("ar", StringComparison.OrdinalIgnoreCase) || ui.StartsWith("ar-", StringComparison.OrdinalIgnoreCase))return "ar";- // Brazilian Portuguese is the only Portuguese, so Portugal's "pt-PT" gets it too.- if (ui.StartsWith("pt", StringComparison.OrdinalIgnoreCase))- return "pt-BR";+ // "fr" and every region ("fr-FR", "fr-CA", …), but not North Frisian "frr".+ if (ui.Equals("fr", StringComparison.OrdinalIgnoreCase) || ui.StartsWith("fr-", StringComparison.OrdinalIgnoreCase))+ return "fr";return "en";}diff --cc src/Filee.Setup/SetupOptions.csindex f56b7ca6,f90ca006..aac82d13--- a/src/Filee.Setup/SetupOptions.cs+++ b/src/Filee.Setup/SetupOptions.cs@@@ -10,7 -10,7 +10,7 @@@// /NOCLOSEAPPLICATIONS don't force-close programs that still run from the install folder after "Filee --quit"// /DIR="folder" install folder (environment variables are expanded)// /LANG=ko language of Setup (and of a newly installed Filee): en, es, ja, ko, zh-CN (Inno: zhcn),- // pl, hi, ru, ar, pt-PT, pt-BR-// pl, hi, ru, ar, pt-BR, fr++// pl, hi, ru, ar, pt-PT, pt-BR, fr, zh-TW// /TASKS="a,b" exactly these options; /MERGETASKS="a,!b" changes the defaults. "!" unticks, "*" ticks// the children too. Names: contextmenu, contextmenu\top, startup, cli, desktopicon// /NOICONS no Start menu and desktop shortcutsdiff --cc src/Filee.Setup/SetupTexts.csindex d297f5cd,3854ca3b..5b117b78--- a/src/Filee.Setup/SetupTexts.cs+++ b/src/Filee.Setup/SetupTexts.cs@@@ -83,9 -83,10 +83,12 @@@ public sealed class SetupTextif (normalized.Equals(code, StringComparison.OrdinalIgnoreCase))return code;}+ if (Filee.App.Services.AppLanguages.PortugueseVariant(normalized) is { } portuguese)+ return portuguese;- // "ko-KR" → ko, "zh-Hans-CN" / "zh-TW" → zh-CN (the only Chinese), "es-MX" → es.+ // "zh-Hant-HK" / "zh-HK" → zh-TW; the primary-language fallback below gives the other Chinese names zh-CN.+ if (Filee.App.Services.AppLanguages.IsTraditionalChinese(normalized))+ return "zh-TW";+ // "ko-KR" → ko, "zh-Hans-CN" → zh-CN, "es-MX" → es.var primary = normalized.Split('-')[0];foreach (var (code, _) in Languages){diff --cc tests/Filee.App.Tests/CropOverlayTests.csindex 13a32856,84d53830..49d5a34f--- a/tests/Filee.App.Tests/CropOverlayTests.cs+++ b/tests/Filee.App.Tests/CropOverlayTests.cs@@@ -27,7 -27,8 +27,8 @@@ public class CropOverlayTestpublic static TheoryData<string, bool> Looks => new(){{ "en", false }, { "en", true }, { "ko", false }, { "ko", true }, { "ru", false }, { "hi", true }, { "ar", false }, { "ar", true },- { "pt-BR", false },+ { "pt-PT", false }, { "pt-PT", true }, { "pt-BR", false }, { "pt-BR", true },+ { "fr", false },};[AvaloniaTheory]diff --cc tests/Filee.App.Tests/LocalizationTests.csindex f92261af,8dd05526..21864293--- a/tests/Filee.App.Tests/LocalizationTests.cs+++ b/tests/Filee.App.Tests/LocalizationTests.cs@@@ -102,7 -91,20 +102,20 @@@ public partial class LocalizationTest[InlineData("pl-PL", "pl")][InlineData("ar-EG", "ar")][InlineData("pt-BR", "pt-BR")]- [InlineData("pt-PT", "pt-BR")]+ [InlineData("pt-PT", "pt-PT")]+ [InlineData("zh-CN", "zh-CN")]+ [InlineData("zh-Hans-CN", "zh-CN")]+ [InlineData("zh-SG", "zh-CN")]+ [InlineData("zh", "zh-CN")]+ [InlineData("zh-Hans-TW", "zh-CN")] // macOS: Simplified script in the Taiwan region+ [InlineData("zh-TW", "zh-TW")]+ [InlineData("zh-Hant-TW", "zh-TW")]+ [InlineData("zh-HK", "zh-TW")]+ [InlineData("zh-Hant-HK", "zh-TW")]+ [InlineData("zh-MO", "zh-TW")]+ [InlineData("fr-FR", "fr")]+ [InlineData("fr-CA", "fr")]+ [InlineData("frr-DE", "en")][InlineData("de-DE", "en")][InlineData("", "en")] // Linux without LANG: the invariant culturepublic void Auto_follows_the_language_the_user_reads_the_os_in(string os, string expected) =>diff --cc tests/Filee.App.Tests/MergeOrderTests.csindex 99a0eef4,9b6b713a..11231235--- a/tests/Filee.App.Tests/MergeOrderTests.cs+++ b/tests/Filee.App.Tests/MergeOrderTests.cs@@@ -126,8 -126,8 +126,9 @@@ public class MergeOrderTest[InlineData("pl")][InlineData("hi")][InlineData("ru")]+ [InlineData("pt-PT")][InlineData("pt-BR")]+ [InlineData("fr")]public void Chooser_fits_long_paths_at_its_minimum_width(string language){TestServices.EnsureInitialized(language);diff --cc tests/Filee.App.Tests/RenderTests.csindex 2e591750,a5f09e05..93e94daa--- a/tests/Filee.App.Tests/RenderTests.cs+++ b/tests/Filee.App.Tests/RenderTests.cs@@@ -31,8 -31,12 +31,11 @@@ public class RenderTest{ "presets", "en" }, { "theme", "en" }, { "engines", "en" }, { "about", "en" },{ "general", "ko" }, { "toolbar", "ko" }, { "home", "ko" },{ "general", "zh-CN" }, { "presets", "zh-CN" }, { "toolbar", "zh-CN" }, { "home", "zh-CN" },+ { "general", "zh-TW" }, { "presets", "zh-TW" }, { "toolbar", "zh-TW" }, { "home", "zh-TW" },+ { "triggers", "zh-TW" }, { "engines", "zh-TW" }, { "watch", "zh-TW" },{ "general", "pl" }, { "toolbar", "pl" }, { "presets", "pl" }, { "home", "pl" },{ "home", "es" }, { "general", "es" }, { "toolbar", "es" }, { "presets", "es" }, { "engines", "es" },- { "home", "pt-BR" }, { "general", "pt-BR" }, { "toolbar", "pt-BR" }, { "presets", "pt-BR" }, { "engines", "pt-BR" },+ { "home", "fr" }, { "general", "fr" }, { "toolbar", "fr" }, { "presets", "fr" }, { "engines", "fr" },{ "home", "hi" }, { "general", "hi" }, { "toolbar", "hi" }, { "presets", "hi" }, { "engines", "hi" },{ "home", "ja" }, { "general", "ja" }, { "triggers", "ja" }, { "toolbar", "ja" },{ "presets", "ja" }, { "theme", "ja" }, { "engines", "ja" }, { "about", "ja" }, { "watch", "ja" },@@@ -1888,8 -1888,8 +1893,9 @@@[InlineData("zh-CN")][InlineData("ru")][InlineData("ar")]+ [InlineData("pt-PT")][InlineData("pt-BR")]+ [InlineData("fr")]public void Live_photo_options_render_for_jpg_and_heic_and_save_only_there(string language){TestServices.EnsureInitialized(language);diff --cc tests/Filee.App.Tests/WhatsNewTests.csindex 893ec40e,d2656220..af00bf9e--- a/tests/Filee.App.Tests/WhatsNewTests.cs+++ b/tests/Filee.App.Tests/WhatsNewTests.cs@@@ -577,9 -484,7 +577,10 @@@ public class WhatsNewTest[InlineData("ru", false)][InlineData("ru", true)][InlineData("pt-BR", false)]+ [InlineData("pt-BR", true)]+ [InlineData("pt-PT", false)]+ [InlineData("pt-PT", true)]+ [InlineData("fr", false)]public void Window_renders(string language, bool dark){TestServices.EnsureInitialized(language);diff --cc tests/Filee.Setup.Tests/SetupTextsTests.csindex be946633,d24f0c07..59aebfb9--- a/tests/Filee.Setup.Tests/SetupTextsTests.cs+++ b/tests/Filee.Setup.Tests/SetupTextsTests.cs@@@ -38,11 -38,20 +38,20 @@@ public partial class SetupTextsTest[InlineData("zhcn", "en-US", "zh-CN")][InlineData("ZH-cn", "en-US", "zh-CN")][InlineData("auto", "ko-KR", "ko")]- [InlineData(null, "zh-TW", "zh-CN")]+ [InlineData(null, "zh-TW", "zh-TW")]+ [InlineData(null, "zh-Hant-TW", "zh-TW")]+ [InlineData(null, "zh-HK", "zh-TW")]+ [InlineData("zh-TW", "en-US", "zh-TW")]+ [InlineData(null, "zh-Hans-CN", "zh-CN")]+ [InlineData(null, "zh-SG", "zh-CN")]+ [InlineData(null, "zh-Hans-TW", "zh-CN")] // an explicit script wins over the region[InlineData(null, "es-MX", "es")][InlineData(null, "pt-BR", "pt-BR")]- [InlineData(null, "pt-PT", "pt-BR")]+ [InlineData(null, "pt-PT", "pt-PT")][InlineData("pt-BR", "en-US", "pt-BR")]+ [InlineData(null, "fr-FR", "fr")]+ [InlineData(null, "fr-CA", "fr")]+ [InlineData("fr", "en-US", "fr")][InlineData(null, "pl-PL", "pl")][InlineData(null, "hi-IN", "hi")][InlineData(null, "ja-JP", "ja")]