diff options
| author | Ilya Kitaev <mbg033@gmail.comm> | 2016-07-21 16:29:37 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.comm> | 2016-07-21 16:29:37 +0300 |
| commit | aa0ea18356ca2435aac7fd0d2ae8f9e638bdaa46 (patch) | |
| tree | 42992e0f2bd2586bb9c6134e372c539f8b2f9577 | |
| parent | e5d5a6082fdcacfd9f1de1b2144101e705f2d322 (diff) | |
| download | monzero-gui-aa0ea18356ca2435aac7fd0d2ae8f9e638bdaa46.tar.gz monzero-gui-aa0ea18356ca2435aac7fd0d2ae8f9e638bdaa46.tar.xz monzero-gui-aa0ea18356ca2435aac7fd0d2ae8f9e638bdaa46.zip | |
translation files moved to resources
| -rw-r--r-- | TranslationManager.cpp | 4 | ||||
| -rw-r--r-- | monero-core.pro | 7 | ||||
| -rw-r--r-- | qml.qrc | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/TranslationManager.cpp b/TranslationManager.cpp index 69448ce2..afd04ef6 100644 --- a/TranslationManager.cpp +++ b/TranslationManager.cpp @@ -25,8 +25,8 @@ bool TranslationManager::setLanguage(const QString &language) return true; } - // we expecting to have translation files in "i18n" directory - QString dir = qApp->applicationDirPath() + QDir::separator() + "i18n"; + // translations are compiled into app binary + QString dir = ":/translations"; QString filename = "monero-core_" + language; diff --git a/monero-core.pro b/monero-core.pro index 877019d0..0c24ea0d 100644 --- a/monero-core.pro +++ b/monero-core.pro @@ -90,8 +90,9 @@ linux { macx { LIBS+= \ - -lboost_serialization \ - -lboost_thread \ + -L/usr/local/lib \ + -lboost_serialization \ + -lboost_thread-mt \ -lboost_system \ -lboost_date_time \ -lboost_filesystem \ @@ -123,7 +124,7 @@ trans_update.depends = $$_PRO_FILE_ trans_release.commands = lrelease $$_PRO_FILE_ trans_release.depends = trans_update $$TRANSLATIONS -translate.commands = $(MKDIR) ${DESTDIR}/i18n && $(COPY) $$PWD/translations/*.qm ${DESTDIR}/i18n +#translate.commands = $(MKDIR) ${DESTDIR}/i18n && $(COPY) $$PWD/translations/*.qm ${DESTDIR}/i18n translate.depends = trans_release QMAKE_EXTRA_TARGETS += trans_update trans_release translate @@ -114,5 +114,11 @@ <file>pages/Receive.qml</file> <file>components/IconButton.qml</file> <file>lang/flags/italy.png</file> + <file>translations/monero-core_de.qm</file> + <file>translations/monero-core_en.qm</file> + <file>translations/monero-core_it.qm</file> + <file>translations/monero-core_pl.qm</file> + <file>translations/monero-core_ru.qm</file> + <file>translations/monero-core_zh.qm</file> </qresource> </RCC> |
