From 63297562e6f1b2435ba71a6570daa4de00ed1752 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 3 Jul 2018 11:46:24 -0700 Subject: [PATCH] iOS: find translations again commit ec0511e824 ("ios: concentrate build dirs") moved the translations around without updating the way they are accessed, causing our release 2.1.0 on iOS to not be localized. Signed-off-by: Dirk Hohndel --- core/qt-init.cpp | 2 +- packaging/ios/translations.qrc | 46 +++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/core/qt-init.cpp b/core/qt-init.cpp index f06da0cab..b1a235cb6 100644 --- a/core/qt-init.cpp +++ b/core/qt-init.cpp @@ -55,7 +55,7 @@ void init_qt_late() #if defined(Q_OS_ANDROID) translationLocation = QLatin1Literal("assets:/translations"); #elif defined(Q_OS_IOS) - translationLocation = QLatin1Literal(":/translations/"); + translationLocation = QLatin1Literal(":/"); #else translationLocation = QLibraryInfo::location(QLibraryInfo::TranslationsPath); #endif diff --git a/packaging/ios/translations.qrc b/packaging/ios/translations.qrc index 16b20505a..b355ecaa0 100644 --- a/packaging/ios/translations.qrc +++ b/packaging/ios/translations.qrc @@ -1,27 +1,27 @@ - build-ios/translations/subsurface_bg_BG.qm - build-ios/translations/subsurface_cs.qm - build-ios/translations/subsurface_da_DK.qm - build-ios/translations/subsurface_de_CH.qm - build-ios/translations/subsurface_de_DE.qm - build-ios/translations/subsurface_en_GB.qm - build-ios/translations/subsurface_en_US.qm - build-ios/translations/subsurface_es_ES.qm - build-ios/translations/subsurface_et_EE.qm - build-ios/translations/subsurface_fi_FI.qm - build-ios/translations/subsurface_fr_FR.qm - build-ios/translations/subsurface_he.qm - build-ios/translations/subsurface_it_IT.qm - build-ios/translations/subsurface_nb_NO.qm - build-ios/translations/subsurface_nl_NL.qm - build-ios/translations/subsurface_pl_PL.qm - build-ios/translations/subsurface_pt_BR.qm - build-ios/translations/subsurface_pt_PT.qm - build-ios/translations/subsurface_ro_RO.qm - build-ios/translations/subsurface_ru_RU.qm - build-ios/translations/subsurface_sk_SK.qm - build-ios/translations/subsurface_sv_SE.qm - build-ios/translations/subsurface_zh_TW.qm + build-ios/translations/subsurface_bg_BG.qm + build-ios/translations/subsurface_cs.qm + build-ios/translations/subsurface_da_DK.qm + build-ios/translations/subsurface_de_CH.qm + build-ios/translations/subsurface_de_DE.qm + build-ios/translations/subsurface_en_GB.qm + build-ios/translations/subsurface_en_US.qm + build-ios/translations/subsurface_es_ES.qm + build-ios/translations/subsurface_et_EE.qm + build-ios/translations/subsurface_fi_FI.qm + build-ios/translations/subsurface_fr_FR.qm + build-ios/translations/subsurface_he.qm + build-ios/translations/subsurface_it_IT.qm + build-ios/translations/subsurface_nb_NO.qm + build-ios/translations/subsurface_nl_NL.qm + build-ios/translations/subsurface_pl_PL.qm + build-ios/translations/subsurface_pt_BR.qm + build-ios/translations/subsurface_pt_PT.qm + build-ios/translations/subsurface_ro_RO.qm + build-ios/translations/subsurface_ru_RU.qm + build-ios/translations/subsurface_sk_SK.qm + build-ios/translations/subsurface_sv_SE.qm + build-ios/translations/subsurface_zh_TW.qm