mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 21:30:19 -06:00
Fixed language selection by adding English, leaving default as "<System>" language. Removed languages which don't have translations yet.
As side-effect, changed GameListCtrl sorting to use the configured IPL/GC language instead of the UI language, which is misleading with missing translations, and possibly wrong if we ever get translations that are not part of the GC ones. In case we want the old behavior back, revert GameListCtrl.cpp and ISOProperties.cpp. For translators: use either "<System>" if your operating system is the same language as the one you're translating for, or replace one of the others. Someone will add them to the list when they are committed. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6785 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -411,14 +411,14 @@ void DolphinApp::InitLanguageSupport()
|
||||
{
|
||||
int language = 0;
|
||||
|
||||
// keep those in sync with CConfigMain::InitializeGUILists
|
||||
const wxLanguage langIds[] =
|
||||
{
|
||||
wxLANGUAGE_DEFAULT,
|
||||
wxLANGUAGE_ENGLISH,
|
||||
wxLANGUAGE_GERMAN,
|
||||
wxLANGUAGE_FRENCH,
|
||||
wxLANGUAGE_SPANISH,
|
||||
wxLANGUAGE_ITALIAN,
|
||||
wxLANGUAGE_DUTCH,
|
||||
};
|
||||
|
||||
IniFile ini;
|
||||
@ -426,7 +426,7 @@ void DolphinApp::InitLanguageSupport()
|
||||
ini.Get("Interface", "Language", &language, 0);
|
||||
|
||||
// Load language if possible, fall back to system default otherwise
|
||||
if(wxLocale::IsAvailable(langIds[language]))
|
||||
if(language >= 0 && language < sizeof(langIds) / sizeof(wxLanguage) && wxLocale::IsAvailable(langIds[language]))
|
||||
{
|
||||
m_locale = new wxLocale(langIds[language]);
|
||||
|
||||
@ -438,14 +438,14 @@ void DolphinApp::InitLanguageSupport()
|
||||
|
||||
if(!m_locale->IsOk())
|
||||
{
|
||||
PanicAlert("Error loading selected language. Falling back to system default.\n");
|
||||
PanicAlert("Error loading selected language. Falling back to system default.\n");
|
||||
delete m_locale;
|
||||
m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
PanicAlert("The selected language is not supported by your system. Falling back to system default.\n");
|
||||
PanicAlert("The selected language is not supported by your system. Falling back to system default.\n");
|
||||
m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user