diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2025-08-03 17:29:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-03 17:29:40 -0400 |
| commit | 1262ac31dce4a0d59a427312baeade9a846b5b91 (patch) | |
| tree | fb3b3c19620a8002c4620cff5964f495fa3e21c3 /Emby.Naming | |
| parent | 0f5bb5cf767e8c5a767be32e26016cae17ae341c (diff) | |
| parent | 2007815fa6b592984a64a6d3d978d41ae8f7347b (diff) | |
Merge pull request #14410 from dyphire/language
Further refinement of BCP 47 language labeling support
Diffstat (limited to 'Emby.Naming')
| -rw-r--r-- | Emby.Naming/ExternalFiles/ExternalPathParser.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Emby.Naming/ExternalFiles/ExternalPathParser.cs b/Emby.Naming/ExternalFiles/ExternalPathParser.cs index 7a01b02f3..3461b3c0d 100644 --- a/Emby.Naming/ExternalFiles/ExternalPathParser.cs +++ b/Emby.Naming/ExternalFiles/ExternalPathParser.cs @@ -97,14 +97,18 @@ namespace Emby.Naming.ExternalFiles if (culture is not null && pathInfo.Language is null) { - pathInfo.Language = culture.ThreeLetterISOLanguageName; + pathInfo.Language = culture.Name.Contains('-', StringComparison.OrdinalIgnoreCase) + ? culture.Name + : culture.ThreeLetterISOLanguageName; extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase); } else if (culture is not null && pathInfo.Language == "hin") { // Hindi language code "hi" collides with a hearing impaired flag - use as Hindi only if no other language is set pathInfo.IsHearingImpaired = true; - pathInfo.Language = culture.ThreeLetterISOLanguageName; + pathInfo.Language = culture.Name.Contains('-', StringComparison.OrdinalIgnoreCase) + ? culture.Name + : culture.ThreeLetterISOLanguageName; extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase); } else if (_namingOptions.MediaHearingImpairedFlags.Any(s => currentSliceWithoutSeparator.Equals(s, StringComparison.OrdinalIgnoreCase))) |