diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-06-01 11:19:09 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-02 08:04:34 +0000 |
| commit | 483390d66b1e1bd899410906f53f3124cacfe73d (patch) | |
| tree | 1cbb70cd117bc734296d0f63b81ba01bed292a8a /l10ntools | |
| parent | 3cf789a15450efcdcf8dd95eeb71bfc746591f1c (diff) | |
Add translation support for short names of Emoji and other symbols
Cherry picked from 4a91d5ee95c9b6ee22053f466e2483035885a032
(Add translation support for short names of Emoji and other symbols)
and 851b3afb28a87934b933184af2ebb8f8144815ab.
(l10ntools: support x-comments in ulf format).
See also https://wiki.documentfoundation.org/Emoji
Change-Id: I3d7ec13d381160d63d535ccbdcd0b3209799d3d5
Reviewed-on: https://gerrit.libreoffice.org/16014
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/lngmerge.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 5465d556a023..959a93c2961f 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -114,6 +114,7 @@ bool LngParser::CreatePO( const OString &rPOFile ) else { WritePO( aPOStream , Text , sSource , sID ); } + Text.erase("x-comment"); } aPOStream.close(); return true; @@ -129,7 +130,7 @@ void LngParser::WritePO(PoOfstream &aPOStream, { common::writePoEntry( "Ulfex", aPOStream, rActFileName, "LngText", - rID, OString(), OString(), rText_inout["en-US"]); + rID, OString(), rText_inout.count("x-comment") ? rText_inout["x-comment"] : OString(), rText_inout["en-US"]); } } |