Browse Source

tde_create_translated_desktop: Allow spaces around the equal sign.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/39/head
Slávek Banko 4 months ago
parent
commit
e8a95f169e
No known key found for this signature in database GPG Key ID: 608F5293A04BE668
2 changed files with 9 additions and 10 deletions
  1. +2
    -2
      modules/TDEL10n.cmake
  2. +7
    -8
      modules/TDEMacros.cmake

+ 2
- 2
modules/TDEL10n.cmake View File

@@ -1253,9 +1253,9 @@ function( tde_l10n_prepare_desktop )
math( EXPR _desktop_pos "${_desktop_pos}+1" )

# process line
if( "${_desktop_line}" MATCHES "^${_keywords_match}=" )
if( "${_desktop_line}" MATCHES "^${_keywords_match}[ ]*=" )
string( REGEX REPLACE "\\\"" "\\\\\"" _desktop_line "${_desktop_line}" )
string( REGEX REPLACE "^${_keywords_match}=([^\n]*)" "/*\\1*/i18n(\"\\2\");" _desktop_line "${_desktop_line}" )
string( REGEX REPLACE "^${_keywords_match}[ ]*=[ ]*([^\n]*)" "/*\\1*/i18n(\"\\2\");" _desktop_line "${_desktop_line}" )
else( )
set( _desktop_line "" )
endif( )


+ 7
- 8
modules/TDEMacros.cmake View File

@@ -1735,7 +1735,7 @@ macro( tde_create_translated_desktop )
# create template for intltool-merge
file( READ ${_src} _src_data )
string( REPLACE ";" "|" _keywords_match "(${_keywords_desktop})" )
string( REGEX REPLACE "(^|\n)${_keywords_match}=" "\\1_\\2=" _src_data "${_src_data}" )
string( REGEX REPLACE "(^|\n)${_keywords_match}[ ]*=[ ]*" "\\1_\\2=" _src_data "${_src_data}" )
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_out_name}.in "${_src_data}" )

# merge translations command
@@ -1749,19 +1749,18 @@ macro( tde_create_translated_desktop )

# merge translations target
add_custom_target( "${_target}" ALL DEPENDS ${_out_name} )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} DESTINATION ${_dest} )

else( )

# just install the original file without translations
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_src}
RENAME ${_out_name}
DESTINATION ${_dest}
)
# just write the original file without translations
file( READ ${_src} _src_data )
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} "${_src_data}" )

endif( )

# install traslated desktop file
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} DESTINATION ${_dest} )

endmacro( )




Loading…
Cancel
Save