summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-06-12 15:07:57 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-06-12 15:08:53 +0200
commit26ef5dbcaf478ec7e646abb4d4b6c44cda6caecc (patch)
tree881fed5b0a8191119ce7b4e032f7a202737c03f8
parentd5ad45541457722acff559e2e7b5b1e7c09092ef (diff)
downloadcmake-v3.5.13-sru.tar.gz
cmake-v3.5.13-sru.zip
Update TDEL10n moduleorigin/v3.5.13-sruv3.5.13-sru
+ Add new options to function tde_l10n_prepare_xml -- preserve / remove multiple line breaks -- this fix the extraction from tips files Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 5121b9a41d671dbaf7350c349d246793d8d8a4e2)
-rw-r--r--modules/TDEL10n.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/TDEL10n.cmake b/modules/TDEL10n.cmake
index 8b2774f..62aad3a 100644
--- a/modules/TDEL10n.cmake
+++ b/modules/TDEL10n.cmake
@@ -690,7 +690,7 @@ function( tde_l10n_prepare_xml )
unset( _context )
set( _skip_properties "database|associations|populationText" )
set( _tags "[tT][eE][xX][tT]|title|string|whatsthis|tooltip|label" )
- set( _preserve "line-wrap" "lines-leading" "spaces-leading" "spaces-trailing" "spaces-multi" )
+ set( _preserve "line-wrap" "lines-leading" "lines-multi" "spaces-leading" "spaces-trailing" "spaces-multi" )
set( _no_c_format 1 )
unset( _directive )
set( _var _source )
@@ -872,8 +872,9 @@ function( tde_l10n_prepare_xml )
if( _xml_inside )
if( ";${_preserve};" MATCHES ";line-wrap;" )
- if( ";${_preserve};" MATCHES ";lines-leading;"
- OR NOT "${_xml_line}" STREQUAL "" OR NOT _xml_tag_empty )
+ if( NOT "${_xml_line}" STREQUAL ""
+ OR ( ";${_preserve};" MATCHES ";lines-leading;" AND _xml_tag_empty )
+ OR ( ";${_preserve};" MATCHES ";lines-multi;" AND NOT _xml_tag_empty ) )
set( _xml_line "${_xml_line}\\n" )
endif( )
elseif( NOT "${_xml_line}" STREQUAL "" AND NOT _xml_tag_empty )