From 611cb1f94c59c14cad9aca5038cc13dd0143da85 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 29 Jun 2017 06:25:49 -0400 Subject: [PATCH] i18n: QT_TRANSLATIONS_DIR hasn't been set since Qt 5.3. None of the Qt translations are found, nor shipped along with the Calamares translations; it depends on the translations of Qt on the live system. The mechanism was broken, anyway, by the split into qt_.qm and qtbase_.qm, and the introduction for QPT for the translation of standard button texts. Just drop the special code looking for Qt translations and the rcc hacks that entails. FIXES #336 --- lang/translations.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lang/translations.cmake b/lang/translations.cmake index dddad3149..fc18f4f11 100644 --- a/lang/translations.cmake +++ b/lang/translations.cmake @@ -7,12 +7,6 @@ macro(add_calamares_translations language) set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}\n" ) foreach( lang ${CALAMARES_LANGUAGES} ) set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}calamares_${lang}.qm\n" ) - if( NOT lang STREQUAL "en" AND EXISTS ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm ) - file( COPY ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm DESTINATION ${CMAKE_CURRENT_BINARY_DIR} ) - set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}qt_${lang}.qm\n" ) - endif() - - # build explicitly enabled languages list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/calamares_${lang}.ts" ) endforeach()