MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

[GLideNUI-wtl] Always use internal English strings (ignore gliden64_en.Lang)

Browse Source
This commit is contained in:
oddMLan 2020-07-14 00:40:35 -07:00 committed by Sergey Lipskiy
parent 1f4912469a
commit e808510b86
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GLideNUI-wtl/Language.cpp
View File

@ -320,9 +320,11 @@ void LoadCurrentStrings(const char * path, const std::string & lang)
{
return;
}
} // default: attempt to use gliden64_en.Lang
std::string langFile = translationsFolder + "gliden64_en.Lang";
LoadLanguageFile(langFile);
}
if (g_defaultStrings.size() == 0)
LoadDefaultStrings();
g_currentStrings.clear();
}
@ -375,7 +377,7 @@ LanguageList GetLanguageList(const char * path)
file.Filename = FindData.cFileName;
file.LanguageName = GetLangString(langFile.c_str(), LANGUAGE_NAME);
if (file.LanguageName.length() == 0)
if (file.LanguageName.length() == 0 || file.LanguageName == stdstr().FromUTF16(L"English"))
continue;
languages.push_back(file);

17
src/GLideNUI-wtl/config-video.cpp
View File

@ -26,7 +26,6 @@ WindowedModes[] = {
{ 1600, 1200, _T("1600 x 1200") }
};
static const unsigned int numWindowedModes = sizeof(WindowedModes) / sizeof(WindowedModes[0]);
static const LPCTSTR englishLang = _T("English");
static u32 pow2(u32 dim)
{
@ -100,14 +99,11 @@ BOOL CVideoTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/) {
m_AAInfoIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
translationsComboBox.SetItemData(translationsComboBox.AddString((LPCTSTR)_T("English")), (DWORD_PTR)"");
for (LanguageList::const_iterator itr = m_LangList.begin(); itr != m_LangList.end(); itr++) {
int indx = translationsComboBox.AddString(ToUTF16(itr->LanguageName.c_str()).c_str());
translationsComboBox.SetItemData(indx, (DWORD_PTR)itr->Filename.c_str());
}
if (translationsComboBox.FindString(-1, englishLang) == CB_ERR) {
int indx = translationsComboBox.AddString(englishLang);
translationsComboBox.SetItemData(indx, (DWORD_PTR)"");
}
return true;
}
@ -464,21 +460,16 @@ void CVideoTab::LoadSettings(bool /*blockCustomSettings*/) {
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
translationsComboBox.SetCurSel(-1);
int englishIndx = -1;
for (int i = 0, n = translationsComboBox.GetCount(); i < n; i++) {
const char * translations = (const char *)translationsComboBox.GetItemDataPtr(i);
if (_stricmp(translations, "gliden64_en.Lang") == 0)
englishIndx = i;
if (config.translationFile == translations) {
translationsComboBox.SetCurSel(i);
break;
}
} // default: attempt to use gliden64_en.Lang
if (englishIndx >= 0 && translationsComboBox.GetCurSel() < 0)
translationsComboBox.SetCurSel(englishIndx);
else if (translationsComboBox.GetCurSel() < 0) // gliden64_en.Lang not found; select hardcoded english
translationsComboBox.SetCurSel(translationsComboBox.FindString(-1, englishLang));
}
if (translationsComboBox.GetCurSel() < 0)
translationsComboBox.SetCurSel(translationsComboBox.FindString(-1, (LPCTSTR)_T("English")));
}
void CVideoTab::SaveSettings()