github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small regression fix

Browse source
This commit is contained in:
Krom, Robertus 2020-02-19 16:18:37 +01:00
commit 2cf0606bde
1 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
GreenshotPlugin/Core/Language.cs
View file

@ -223,7 +223,7 @@ namespace GreenshotPlugin.Core {
/// <summary> /// <summary>
/// Try to find the best match for the supplied IETF /// Try to find the best match for the supplied IETF
/// </summary> /// </summary>
/// <param name="inputIetf"></param> /// <param name="inputIetf">string</param>
/// <returns>IETF</returns> /// <returns>IETF</returns>
private static string FindBestIetfMatch(string inputIetf) { private static string FindBestIetfMatch(string inputIetf) {
string returnIetf = inputIetf; string returnIetf = inputIetf;
@ -237,13 +237,13 @@ namespace GreenshotPlugin.Core {
returnIetf = returnIetf.Substring(0, 2); returnIetf = returnIetf.Substring(0, 2);
} }
foreach (string availableIetf in LanguageFiles.Keys) { foreach (string availableIetf in LanguageFiles.Keys) {
if (availableIetf.StartsWith(returnIetf)) { if (!availableIetf.StartsWith(returnIetf)) continue;
Log.InfoFormat("Found language {0}, best match for {1}!", availableIetf, returnIetf); Log.InfoFormat("Found language {0}, best match for {1}!", availableIetf, returnIetf);
returnIetf = availableIetf; returnIetf = availableIetf;
break; break;
} }
} }
}
return returnIetf; return returnIetf;
} }
@ -278,6 +278,7 @@ namespace GreenshotPlugin.Core {
// Only take the ones without prefix, these are the "base" language files // Only take the ones without prefix, these are the "base" language files
if (langFile.Prefix != null) continue; if (langFile.Prefix != null) continue;
languages.Add(langFile); languages.Add(langFile);
break;
} }
} }
return languages; return languages;
@ -422,7 +423,10 @@ namespace GreenshotPlugin.Core {
bool needToAdd = true; bool needToAdd = true;
List<LanguageFile> deleteList = new List<LanguageFile>(); List<LanguageFile> deleteList = new List<LanguageFile>();
foreach (LanguageFile compareWithLangfile in currentFiles) { foreach (LanguageFile compareWithLangfile in currentFiles) {
if ((languageFile.Prefix == null && compareWithLangfile.Prefix == null) || (languageFile.Prefix != null && languageFile.Prefix.Equals(compareWithLangfile.Prefix))) { if ((languageFile.Prefix != null || compareWithLangfile.Prefix != null) &&
(languageFile.Prefix == null ||
!languageFile.Prefix.Equals(compareWithLangfile.Prefix))) continue;
if (compareWithLangfile.Version > languageFile.Version) { if (compareWithLangfile.Version > languageFile.Version) {
Log.WarnFormat("Skipping {0}:{1}:{2} as {3}:{4}:{5} is newer", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath, compareWithLangfile.Prefix, compareWithLangfile.Version); Log.WarnFormat("Skipping {0}:{1}:{2} as {3}:{4}:{5} is newer", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath, compareWithLangfile.Prefix, compareWithLangfile.Version);
needToAdd = false; needToAdd = false;
@ -432,7 +436,6 @@ namespace GreenshotPlugin.Core {
Log.WarnFormat("Found {0}:{1}:{2} and deleting {3}:{4}:{5}", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath, compareWithLangfile.Prefix, compareWithLangfile.Version); Log.WarnFormat("Found {0}:{1}:{2} and deleting {3}:{4}:{5}", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath, compareWithLangfile.Prefix, compareWithLangfile.Version);
deleteList.Add(compareWithLangfile); deleteList.Add(compareWithLangfile);
} }
}
if (needToAdd) { if (needToAdd) {
foreach (LanguageFile deleteFile in deleteList) { foreach (LanguageFile deleteFile in deleteList) {
currentFiles.Remove(deleteFile); currentFiles.Remove(deleteFile);