preserve language name case in file name if LanguageInfo not available
This commit is contained in:
@@ -494,7 +494,7 @@ const LanguageInfo *GetLanguageInfo( const RString &sIsoCode )
|
|||||||
// and languages that had native forms on the site listed above.
|
// and languages that had native forms on the site listed above.
|
||||||
// Obscure languages are dropped so that they don't clutter up the
|
// Obscure languages are dropped so that they don't clutter up the
|
||||||
// smtools UI.
|
// smtools UI.
|
||||||
if( sIsoCode.CompareNoCase(g_langs[i].szIsoCode) == 0 )
|
if( sIsoCode.EqualsNoCase(g_langs[i].szIsoCode) )
|
||||||
return &g_langs[i];
|
return &g_langs[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -218,6 +218,10 @@ RString ThemeManager::GetThemeDisplayName( const RString &sThemeName )
|
|||||||
return sThemeName;
|
return sThemeName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool EqualsNoCase( const RString &s1, const RString &s2 )
|
||||||
|
{
|
||||||
|
return s1.EqualsNoCase(s2);
|
||||||
|
}
|
||||||
void ThemeManager::GetLanguages( vector<RString>& AddTo )
|
void ThemeManager::GetLanguages( vector<RString>& AddTo )
|
||||||
{
|
{
|
||||||
AddTo.clear();
|
AddTo.clear();
|
||||||
@@ -225,12 +229,9 @@ void ThemeManager::GetLanguages( vector<RString>& AddTo )
|
|||||||
for( unsigned i = 0; i < g_vThemes.size(); ++i )
|
for( unsigned i = 0; i < g_vThemes.size(); ++i )
|
||||||
GetLanguagesForTheme( g_vThemes[i].sThemeName, AddTo );
|
GetLanguagesForTheme( g_vThemes[i].sThemeName, AddTo );
|
||||||
|
|
||||||
FOREACH( RString, AddTo, s )
|
|
||||||
s->MakeLower();
|
|
||||||
|
|
||||||
// remove dupes
|
// remove dupes
|
||||||
sort( AddTo.begin(), AddTo.end() );
|
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());
|
AddTo.erase(it, AddTo.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user