GetLanguages: check all loaded themes
This commit is contained in:
@@ -145,12 +145,9 @@ bool ThemeManager::DoesThemeExist( const CString &sThemeName )
|
|||||||
void ThemeManager::GetLanguages( CStringArray& AddTo )
|
void ThemeManager::GetLanguages( CStringArray& AddTo )
|
||||||
{
|
{
|
||||||
AddTo.clear();
|
AddTo.clear();
|
||||||
CStringArray asTemp;
|
|
||||||
|
|
||||||
/* XXX: this should use FallbackTheme */
|
for( unsigned i = 0; i < g_vThemes.size(); ++i )
|
||||||
GetLanguagesForTheme( m_sCurThemeName, AddTo );
|
GetLanguagesForTheme( g_vThemes[i].sThemeName, AddTo );
|
||||||
GetLanguagesForTheme( BASE_THEME_NAME, asTemp );
|
|
||||||
AddTo.insert( AddTo.begin(), asTemp.begin(), asTemp.end() );
|
|
||||||
|
|
||||||
// remove dupes
|
// remove dupes
|
||||||
sort( AddTo.begin(), AddTo.end() );
|
sort( AddTo.begin(), AddTo.end() );
|
||||||
@@ -786,7 +783,7 @@ void ThemeManager::GetLanguagesForTheme( const CString &sThemeName, CStringArray
|
|||||||
as[i] = as[i].Left( as[i].size()-4 );
|
as[i] = as[i].Left( as[i].size()-4 );
|
||||||
}
|
}
|
||||||
|
|
||||||
asLanguagesOut = as;
|
asLanguagesOut.insert( asLanguagesOut.end(), as.begin(), as.end() );
|
||||||
}
|
}
|
||||||
|
|
||||||
CString ThemeManager::GetLanguageIniPath( const CString &sThemeName, const CString &sLanguage )
|
CString ThemeManager::GetLanguageIniPath( const CString &sThemeName, const CString &sLanguage )
|
||||||
|
|||||||
Reference in New Issue
Block a user