strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup: don't use German as fallback language

Browse source
This commit is contained in:
Andras Timar 2011-09-16 19:22:38 +02:00
parent a705aec511
commit 5b465d8770
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
l10ntools/source/helpmerge.cxx
View file

@ -52,7 +52,6 @@
void HelpParser::FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in ){
/*****************************************************************************/
static const ByteString ENGLISH_LANGUAGECODE( "en-US" );
static const ByteString GERMAN_LANGUAGECODE ( "de" );
ByteString sCur;
XMLElement* pTmp = NULL;
XMLElement* pTmp2 = NULL;
@ -75,14 +74,6 @@ void HelpParser::FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in
pTmp->ChangeLanguageTag( String( sLangIdx_in , RTL_TEXTENCODING_ASCII_US) );
rElem_out[ sCur ] = pTmp;
pTmp2 = NULL;
}
else if( (rElem_out.find( GERMAN_LANGUAGECODE ) != rElem_out.end() ) && rElem_out[ GERMAN_LANGUAGECODE ] != NULL ){// No English
pTmp2 = rElem_out[ GERMAN_LANGUAGECODE ];
pTmp = new XMLElement( *pTmp2 ); // Copy
pTmp->SetPos( pTmp2->GetPos()+1 );
pTmp->ChangeLanguageTag( String( sLangIdx_in , RTL_TEXTENCODING_ASCII_US ) );
rElem_out[ sCur ] = pTmp;
pTmp2 = NULL;
}else{
fprintf(stdout,"ERROR: No Fallback found for language %s:\n",sCur.GetBuffer());
rElem_out[ sCur ]=new XMLElement(); // Use dummy element
@ -322,7 +313,6 @@ bool ByteStringLess( const ByteString& rKey1, const ByteString& rKey2 ) {
void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile ){
std::vector<ByteString> aTmp;
const ByteString DE ("de");
const ByteString ENUS ("en-US");
static const ByteString ALL( "ALL" );
@ -331,7 +321,6 @@ void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDat
if( Export::sLanguages.EqualsIgnoreCaseAscii( ALL ) )
{
aLanguages = aMergeDataFile.GetLanguages();
aLanguages.push_back( DE );
aLanguages.push_back( ENUS );
if( !Export::sForcedLanguages.Equals("") )