Kaydet (Commit) 1471103b authored tarafından Zolnai Tamás's avatar Zolnai Tamás

fdo#87754: duplicated strings in an ItemList are not translated

Change-Id: I72c6e234ff999a6dbed48cc62fe7d39aeb798f35
üst 04fa50e3
...@@ -1156,10 +1156,12 @@ void Export::MergeRest( ResData *pResData ) ...@@ -1156,10 +1156,12 @@ void Export::MergeRest( ResData *pResData )
} }
MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData ); MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
OString sText;
bool bText = pEntrys && pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, true );
if( bText && !sText.isEmpty()) if( pEntrys )
{
OString sText;
pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, false );
if( !sText.isEmpty())
{ {
ConvertMergeContent( sText ); ConvertMergeContent( sText );
sLine = sLine =
...@@ -1167,6 +1169,7 @@ void Export::MergeRest( ResData *pResData ) ...@@ -1167,6 +1169,7 @@ void Export::MergeRest( ResData *pResData )
sText + sText +
sLine.copy( sLine.lastIndexOf('"') + 1 ); sLine.copy( sLine.lastIndexOf('"') + 1 );
} }
}
OString sText1( "\t" ); OString sText1( "\t" );
sText1 += sLine; sText1 += sLine;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment