diff --git a/modules/ECMQmLoader.cpp.in b/modules/ECMQmLoader.cpp.in index 05c1a59..dcd601e 100644 --- a/modules/ECMQmLoader.cpp.in +++ b/modules/ECMQmLoader.cpp.in @@ -1,127 +1,127 @@ /* This file was generated by ecm_create_qm_loader(). DO NOT EDIT! * * Building this file in a library ensures translations are automatically loaded * when an application makes use of the library. * * * Copyright 2014 Aurélien Gâteau * Copyright 2015 Alex Merry * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include #include #include #include #include #include namespace { bool loadTranslation(const QString &localeDirName) { QString subPath = QStringLiteral("locale/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm"); #if defined(Q_OS_ANDROID) - const QString fullPath = QDir::homePath() + QStringLiteral("/../qt-reserved-files/share/") + subPath; + const QString fullPath = QStringLiteral("assets:/share/") + subPath; if (!QFile::exists(fullPath)) { return false; } #else const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath); if (fullPath.isEmpty()) { return false; } #endif QTranslator *translator = new QTranslator(QCoreApplication::instance()); if (!translator->load(fullPath)) { delete translator; return false; } QCoreApplication::instance()->installTranslator(translator); return true; } void load() { // The way Qt translation system handles plural forms makes it necessary to // have a translation file which contains only plural forms for `en`. That's // why we load the `en` translation unconditionally, then load the // translation for the current locale to overload it. loadTranslation(QStringLiteral("en")); QLocale locale = QLocale::system(); if (locale.name() != QStringLiteral("en")) { if (!loadTranslation(locale.name())) { if (!loadTranslation(locale.bcp47Name())) { const int i = locale.name().indexOf(QLatin1Char('_')); if (i > 0) { loadTranslation(locale.name().left(i)); } } } } } // Helper to call load() on the main thread. // // Calling functions on another thread without using moc is non-trivial in // Qt until 5.4 (when some useful QTimer::singleShot overloads were added). // // Instead, we have to use QEvents. Ideally, we'd use a custom QEvent, but // there's a chance this could cause trouble with applications that claim // QEvent codes themselves, but don't register them with Qt (and we also // want to avoid registering a new QEvent code for every plugin that might // be loaded). We use QTimer because it's unlikely to be filtered by // applications, and is also unlikely to cause Qt to do something it // shouldn't. class Loader : public QObject { protected: void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE { load(); this->deleteLater(); } }; void loadOnMainThread() { // If this library is loaded after the QCoreApplication instance is // created (eg: because it is brought in by a plugin), there is no // guarantee this function will be called on the main thread. // QCoreApplication::installTranslator needs to be called on the main // thread, because it uses QCoreApplication::sendEvent. if (QThread::currentThread() == QCoreApplication::instance()->thread()) { load(); } else { // QObjects inherit their parent object's thread Loader *loader = new Loader(); loader->moveToThread(QCoreApplication::instance()->thread()); QCoreApplication::instance()->postEvent(loader, new QTimerEvent(0), Qt::HighEventPriority); } } } Q_COREAPP_STARTUP_FUNCTION(loadOnMainThread)