From 4a156d63cd80bc49d327e1641fc3e1683091e836 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 26 Jan 2024 09:49:15 -0800 Subject: [PATCH] update translation tooling to work with Qt6 Signed-off-by: Dirk Hohndel --- scripts/updatetranslationsource.sh | 2 +- translations/CMakeLists.txt | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/updatetranslationsource.sh b/scripts/updatetranslationsource.sh index 1cf6f4620..4dddd609c 100755 --- a/scripts/updatetranslationsource.sh +++ b/scripts/updatetranslationsource.sh @@ -33,7 +33,7 @@ chmod 000 mobile-widgets/3rdparty rm translations/subsurface_source.ts # enable creating the translation strings -sed -i.bak 's/# qt5_create_translation/ qt5_create_translation/ ; s/# add_custom_target(translations_update/ add_custom_target(translations_update/' translations/CMakeLists.txt +sed -i.bak 's/#!#//' translations/CMakeLists.txt popd diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt index 01b3d6c8a..5dd8249ca 100644 --- a/translations/CMakeLists.txt +++ b/translations/CMakeLists.txt @@ -67,6 +67,11 @@ add_custom_target (translations ALL DEPENDS ${TRANSLATIONS}) # # DO NOT DO THIS MANUALLY -- USE THE SCRIPT IN ORDER TO FIX NUMERUSFORM # ===================================================================== -# qt5_create_translation(TRANSLATION_MESSAGES ${CMAKE_SOURCE_DIR} ${TRANSLATION_FILES}) -# qt5_create_translation(TRANSLATION_MESSAGES ${CMAKE_SOURCE_DIR} ${US_EN_PLURALS} OPTIONS -pluralonly) -# add_custom_target(translations_update DEPENDS ${TRANSLATION_MESSAGES}) +#!# if(NOT USINGQT6) +#!# qt5_create_translation(TRANSLATION_MESSAGES ${CMAKE_SOURCE_DIR} ${TRANSLATION_FILES}) +#!# qt5_create_translation(TRANSLATION_MESSAGES ${CMAKE_SOURCE_DIR} ${US_EN_PLURALS} OPTIONS -pluralonly) +#!# else() +#!# qt6_add_translation(TRANSLATION_MESSAGES ${CMAKE_SOURCE_DIR} ${TRANSLATION_FILES}) +#!# qt6_add_translation(TRANSLATION_MESSAGES ${CMAKE_SOURCE_DIR} ${US_EN_PLURALS} OPTIONS -pluralonly) +#!# endif() +#!# add_custom_target(translations_update DEPENDS ${TRANSLATION_MESSAGES})