Merge pull request 'Online-installer: translator revision' (#152) from feature/refactoring-translator into develop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/desktop-apps/pulls/152
This commit is contained in:
Oleg Kozhukharenko
2025-01-20 14:54:35 +00:00

View File

@ -107,17 +107,19 @@ wstring Translator::tr(const char *str)
//wcout << L"\n\n" << translatedStr << L"\n" << it->second;
if (strIdPair.first == translatedStr) {
if (strIdPair.second.find(langName) != strIdPair.second.end())
translatedStr = strIdPair.second[langName];
return strIdPair.second[langName];
else {
wstring primaryLangAndScript = getPrimaryLang(langName, true);
if (strIdPair.second.find(primaryLangAndScript) != strIdPair.second.end())
translatedStr = strIdPair.second[primaryLangAndScript];
return strIdPair.second[primaryLangAndScript];
else {
wstring primaryLang = getPrimaryLang(langName);
if (strIdPair.second.find(primaryLang) != strIdPair.second.end())
translatedStr = strIdPair.second[primaryLang];
return strIdPair.second[primaryLang];
}
}
if (strIdPair.second.find(L"en") != strIdPair.second.end())
return strIdPair.second[L"en"];
break;
}
// }