diff options
| author | jan iversen <jani@documentfoundation.org> | 2016-03-14 22:10:23 +0100 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-03-14 23:31:44 +0100 |
| commit | 48c2e04bdb60429823cb8b12a14d954af544a2bf (patch) | |
| tree | a4c5065547a6ab275ef646ee8416447f64f02cde /l10ntools/source/merge.cxx | |
| parent | 575b1efb193ac5e921b83ead157c1c639aec0e92 (diff) | |
genLang update
removed gL10nMemDB (combined with gL10nMemDB) to avoid CLANG problem.
removed (temporary) gL10nMem dependency on convPO (circular dep).
Change-Id: I17646be2ccc0feaaa8850a9b753f86c8c62e9f24
Diffstat (limited to 'l10ntools/source/merge.cxx')
| -rw-r--r-- | l10ntools/source/merge.cxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 7789e3bad730..3922e89f0b9d 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -121,22 +121,13 @@ bool MergeEntrys::GetText( OString &rReturn, return bReturn; } -namespace -{ - OString GetDoubleBars() - { - //DOUBLE VERTICAL LINE instead of || because the translations make their - //way into action_names under gtk3 where || is illegal - return OUStringToOString(OUString(static_cast<sal_Unicode>(0x2016)), RTL_TEXTENCODING_UTF8); - } -} OString MergeEntrys::GetQTZText(const ResData& rResData, const OString& rOrigText) { const OString sFilename = rResData.sFilename.copy(rResData.sFilename.lastIndexOf('/')+1); const OString sKey = PoEntry::genKeyId(sFilename + rResData.sGId + rResData.sId + rResData.sResTyp + rOrigText); - return sKey + GetDoubleBars() + rOrigText; + return sKey + "||" + rOrigText; } @@ -420,9 +411,9 @@ void MergeDataFile::InsertEntry( const OString sTemp = rInFilename + rGID + rLID + rTYP; pMergeEntrys->InsertEntry( nLANG, - rTEXT.isEmpty()? rTEXT : PoEntry::genKeyId(sTemp + rTEXT) + GetDoubleBars() + rTEXT, - rQHTEXT.isEmpty()? rQHTEXT : PoEntry::genKeyId(sTemp + rQHTEXT) + GetDoubleBars() + rQHTEXT, - rTITLE.isEmpty()? rTITLE : PoEntry::genKeyId(sTemp + rTITLE) + GetDoubleBars() + rTITLE ); + rTEXT.isEmpty()? rTEXT : PoEntry::genKeyId(sTemp + rTEXT) + "||" + rTEXT, + rQHTEXT.isEmpty()? rQHTEXT : PoEntry::genKeyId(sTemp + rQHTEXT) + "||" + rQHTEXT, + rTITLE.isEmpty()? rTITLE : PoEntry::genKeyId(sTemp + rTITLE) + "||" + rTITLE ); } else { |