allow empty translatable strings

This commit is contained in:
Glenn Maynard
2006-01-14 04:31:56 +00:00
parent 7c25138029
commit 776ff285cf
+3 -3
View File
@@ -942,11 +942,10 @@ RString ThemeManager::GetString( const RString &sClassName, const RString &sValu
// TODO: Move this escaping into IniFile? // TODO: Move this escaping into IniFile?
sValueName.Replace( "\n", "\\n" ); sValueName.Replace( "\n", "\\n" );
RString s = GetMetric( sClassName, sValueName );
// Write stubs for missing strings into every language file. // Write stubs for missing strings into every language file.
// Language strings may not be empty. Empty strings are considered to need translation RString s;
if( s.empty() ) if( !ThemeManager::GetMetricRawRecursive( sClassName, sValueName, s ) )
{ {
RString sFile = GetLanguageIniPath( SpecialFiles::BASE_THEME_NAME, m_sCurLanguage ); RString sFile = GetLanguageIniPath( SpecialFiles::BASE_THEME_NAME, m_sCurLanguage );
IniFile ini; IniFile ini;
@@ -957,6 +956,7 @@ RString ThemeManager::GetString( const RString &sClassName, const RString &sValu
LoadThemeMetrics( g_vThemes, m_sCurThemeName, m_sCurLanguage ); LoadThemeMetrics( g_vThemes, m_sCurThemeName, m_sCurLanguage );
} }
EvaluateString( s );
s.Replace( "\\n", "\n" ); s.Replace( "\\n", "\n" );