diff options
Diffstat (limited to 'Emby.Server.Implementations')
3 files changed, 19 insertions, 11 deletions
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs index ab30971e2..1e3b8ea76 100644 --- a/Emby.Server.Implementations/Library/MediaSourceManager.cs +++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs @@ -379,7 +379,7 @@ namespace Emby.Server.Implementations.Library var culture = _localizationManager.FindLanguageInfo(language); if (culture is not null) { - return culture.ThreeLetterISOLanguageNames; + return culture.Name.Contains('-', StringComparison.OrdinalIgnoreCase) ? [culture.Name] : culture.ThreeLetterISOLanguageNames; } return [language]; diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs index 242f2af56..b4c65ad85 100644 --- a/Emby.Server.Implementations/Localization/LocalizationManager.cs +++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs @@ -128,7 +128,8 @@ namespace Emby.Server.Implementations.Localization } string name = parts[3]; - if (string.IsNullOrWhiteSpace(name)) + string displayname = parts[3]; + if (string.IsNullOrWhiteSpace(displayname)) { continue; } @@ -138,6 +139,10 @@ namespace Emby.Server.Implementations.Localization { continue; } + else if (twoCharName.Contains('-', StringComparison.OrdinalIgnoreCase)) + { + name = twoCharName; + } string[] threeLetterNames; if (string.IsNullOrWhiteSpace(parts[1])) @@ -153,7 +158,7 @@ namespace Emby.Server.Implementations.Localization iso6392BtoTdict.TryAdd(parts[1], parts[0]); } - list.Add(new CultureDto(name, name, twoCharName, threeLetterNames)); + list.Add(new CultureDto(name, displayname, twoCharName, threeLetterNames)); } _cultures = list; diff --git a/Emby.Server.Implementations/Localization/iso6392.txt b/Emby.Server.Implementations/Localization/iso6392.txt index 97da67481..dc4b5d45a 100644 --- a/Emby.Server.Implementations/Localization/iso6392.txt +++ b/Emby.Server.Implementations/Localization/iso6392.txt @@ -311,8 +311,8 @@ nia|||Nias|nias nic|||Niger-Kordofanian languages|nigéro-kordofaniennes, langues niu|||Niuean|niué nld|dut|nl|Dutch; Flemish|néerlandais; flamand -nno||nn|Norwegian Nynorsk; Nynorsk, Norwegian|norvégien nynorsk; nynorsk, norvégien -nob||nb|Bokmål, Norwegian; Norwegian Bokmål|norvégien bokmål +nno||nn|Norwegian (Nynorsk)|norvégien (nynorsk) +nob||nb|Norwegian (Bokmal)|norvégien (bokmål) nog|||Nogai|nogaï; nogay non|||Norse, Old|norrois, vieux nor||no|Norwegian|norvégien @@ -391,10 +391,10 @@ slv||sl|Slovenian|slovène sma|||Southern Sami|sami du Sud sme||se|Northern Sami|sami du Nord smi|||Sami languages|sames, langues -smj|||Lule Sami|sami de Lule -smn|||Inari Sami|sami d'Inari +smj|||Sami (Lule)|sami de Lule +smn|||Sami (Inari)|sami d'Inari smo||sm|Samoan|samoan -sms|||Skolt Sami|sami skolt +sms|||Sami (Skolt)|sami skolt sna||sn|Shona|shona snd||sd|Sindhi|sindhi snk|||Soninke|soninké @@ -483,9 +483,12 @@ zen|||Zenaga|zenaga zgh|||Standard Moroccan Tamazight|amazighe standard marocain zha||za|Zhuang; Chuang|zhuang; chuang zho|chi|zh|Chinese|chinois -zho|chi|ze|Chinese; Bilingual|chinois -zho|chi|zh-tw|Chinese; Traditional|chinois -zho|chi|zh-hk|Chinese; Hong Kong|chinois +zho|chi|ze|Chinese (Bilingual)|chinois +zho|chi|zh-cn|Chinese (Simplified)|chinois +zho|chi|zh-hans|Chinese (Simplified)|chinois +zho|chi|zh-tw|Chinese (Traditional)|chinois +zho|chi|zh-hant|Chinese (Traditional)|chinois +zho|chi|zh-hk|Chinese (Hong Kong)|chinois znd|||Zande languages|zandé, langues zul||zu|Zulu|zoulou zun|||Zuni|zuni |