preserve language name case in file name if LanguageInfo not available

This commit is contained in:
Chris Danford
2006-06-24 16:57:39 +00:00
parent 3f15b07616
commit b44ad7a4e0
2 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -494,7 +494,7 @@ const LanguageInfo *GetLanguageInfo( const RString &sIsoCode )
// and languages that had native forms on the site listed above.
// Obscure languages are dropped so that they don't clutter up the
// smtools UI.
if( sIsoCode.CompareNoCase(g_langs[i].szIsoCode) == 0 )
if( sIsoCode.EqualsNoCase(g_langs[i].szIsoCode) )
return &g_langs[i];
}
+5 -4
View File
@@ -218,6 +218,10 @@ RString ThemeManager::GetThemeDisplayName( const RString &sThemeName )
return sThemeName;
}
static bool EqualsNoCase( const RString &s1, const RString &s2 )
{
return s1.EqualsNoCase(s2);
}
void ThemeManager::GetLanguages( vector<RString>& AddTo )
{
AddTo.clear();
@@ -225,12 +229,9 @@ void ThemeManager::GetLanguages( vector<RString>& AddTo )
for( unsigned i = 0; i < g_vThemes.size(); ++i )
GetLanguagesForTheme( g_vThemes[i].sThemeName, AddTo );
FOREACH( RString, AddTo, s )
s->MakeLower();
// remove dupes
sort( AddTo.begin(), AddTo.end() );
vector<RString>::iterator it = unique( AddTo.begin(), AddTo.end() );
vector<RString>::iterator it = unique( AddTo.begin(), AddTo.end(), EqualsNoCase );
AddTo.erase(it, AddTo.end());
}