Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 12:44:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2085 from ivandrofly/settings

Browse Source 
[Settings] - Remove duplicates.
This commit is contained in:
Nikolaj Olsson 2016-11-17 17:58:58 +01:00 committed by GitHub
commit cae2a5510e
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Forms/Settings.cs
View File

@ -981,39 +981,23 @@ namespace Nikse.SubtitleEdit.Forms
{
if (!cultures.Contains(culture))
cultures.Add(culture);
}
}
}
}
foreach (var culture in CultureInfo.GetCultures(CultureTypes.NeutralCultures))
{
if (Directory.GetFiles(dir, culture.ThreeLetterISOLanguageName + "_OCRFixReplaceList.xml").Length == 1)
if (Directory.GetFiles(dir, culture.ThreeLetterISOLanguageName + "_OCRFixReplaceList.xml").Length == 1 ||
Directory.GetFiles(dir, culture.ThreeLetterISOLanguageName + "_OCRFixReplaceList_User.xml").Length == 1)
{
bool found = false;
foreach (var ci in cultures)
{
if (ci.ThreeLetterISOLanguageName == culture.ThreeLetterISOLanguageName)
{
found = true;
cultures.Add(culture);
break;
}
}
if (!found)
cultures.Add(culture);
}
else if (Directory.GetFiles(dir, culture.ThreeLetterISOLanguageName + "_OCRFixReplaceList_User.xml").Length == 1)
{
bool found = false;
foreach (var ci in cultures)
{
if (ci.ThreeLetterISOLanguageName == culture.ThreeLetterISOLanguageName)
{
found = true;
break;
}
}
if (!found)
cultures.Add(culture);
}
}