diff --git a/libse/ContainerFormats/TransportStream/ProgramMapTableParser.cs b/libse/ContainerFormats/TransportStream/ProgramMapTableParser.cs index 0a3e06c14..4b5b02110 100644 --- a/libse/ContainerFormats/TransportStream/ProgramMapTableParser.cs +++ b/libse/ContainerFormats/TransportStream/ProgramMapTableParser.cs @@ -134,9 +134,9 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream { var language = GetSubtitleLanguage(packetId); var uppercaseLanguage = language.ToUpperInvariant(); - if (IsoCountryCodes.ThreeToTweLetterLookup.ContainsKey(uppercaseLanguage)) + if (IsoCountryCodes.ThreeToTwoLetterLookup.ContainsKey(uppercaseLanguage)) { - return IsoCountryCodes.ThreeToTweLetterLookup[uppercaseLanguage].ToLowerInvariant(); + return IsoCountryCodes.ThreeToTwoLetterLookup[uppercaseLanguage].ToLowerInvariant(); } return language; } diff --git a/libse/IsoCountryCodes.cs b/libse/IsoCountryCodes.cs index 4d7c7f661..7ac6132f5 100644 --- a/libse/IsoCountryCodes.cs +++ b/libse/IsoCountryCodes.cs @@ -5,7 +5,7 @@ namespace Nikse.SubtitleEdit.Core { public static class IsoCountryCodes { - public static Dictionary ThreeToTweLetterLookup = new Dictionary + public static Dictionary ThreeToTwoLetterLookup = new Dictionary { { "AFG", "AF" }, { "ALA", "AX" }, @@ -256,7 +256,6 @@ namespace Nikse.SubtitleEdit.Core { "ZWE", "ZW" }, }; - /// /// Get three letter language code, from two letter language code. /// @@ -264,13 +263,8 @@ namespace Nikse.SubtitleEdit.Core /// Three letter language code in lowercase, string.Empty if not found public static string GetThreeLetterCodeFromTwoLetterCode(string twoLetterCode) { - var threeLetters = ThreeToTweLetterLookup.FirstOrDefault(p => p.Value == twoLetterCode.ToUpperInvariant()); - if (threeLetters.Key?.Length == 3) - { - return threeLetters.Key.ToLowerInvariant(); - } - - return string.Empty; + var lookupResult = ThreeToTwoLetterLookup.FirstOrDefault(p => p.Value == twoLetterCode.ToUpperInvariant()); + return lookupResult.Key?.Length == 3 ? lookupResult.Key.ToLowerInvariant() : string.Empty; } } } diff --git a/src/Forms/BatchConvert.cs b/src/Forms/BatchConvert.cs index 6b8cf6bf2..e19c8156f 100644 --- a/src/Forms/BatchConvert.cs +++ b/src/Forms/BatchConvert.cs @@ -726,7 +726,7 @@ namespace Nikse.SubtitleEdit.Forms } if (Configuration.Settings.Tools.BatchConvertMkvLanguageCodeStyle == "2" && - IsoCountryCodes.ThreeToTweLetterLookup.TryGetValue(languageCode.ToUpperInvariant(), out var twoLetterCode)) + IsoCountryCodes.ThreeToTwoLetterLookup.TryGetValue(languageCode.ToUpperInvariant(), out var twoLetterCode)) { return twoLetterCode.ToLowerInvariant() + "."; } diff --git a/src/Logic/Ocr/OcrFixEngine.cs b/src/Logic/Ocr/OcrFixEngine.cs index 38cc39aff..a045847a9 100644 --- a/src/Logic/Ocr/OcrFixEngine.cs +++ b/src/Logic/Ocr/OcrFixEngine.cs @@ -173,7 +173,7 @@ namespace Nikse.SubtitleEdit.Logic.Ocr foreach (var culture in CultureInfo.GetCultures(CultureTypes.NeutralCultures)) { var twoLetterCode = "?"; - if (threeLetterIsoLanguageName != null && IsoCountryCodes.ThreeToTweLetterLookup.TryGetValue(threeLetterIsoLanguageName, out twoLetterCode)) + if (threeLetterIsoLanguageName != null && IsoCountryCodes.ThreeToTwoLetterLookup.TryGetValue(threeLetterIsoLanguageName, out twoLetterCode)) { twoLetterCode = twoLetterCode.ToLowerInvariant(); }