From 5e5c0a10ff9b4cd4f2b1cfdec4f976861b1de160 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 17 Jun 2013 12:40:23 +0200 Subject: Implement dedicated translation settings support. Change-Id: I41dd23f01e9b511c217fee7f736d9187b8a8623a Reviewed-by: Niels Weber Reviewed-by: Tim Jenssen Reviewed-by: Kai Koehne --- src/libs/installer/component.cpp | 19 ++++++++++++++++--- src/libs/installer/settings.cpp | 40 ++++++++++++++++++++++++++++++++++++++-- src/libs/installer/settings.h | 4 ++++ 3 files changed, 58 insertions(+), 5 deletions(-) (limited to 'src/libs') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 705fb6d3c..c2cadafc6 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -46,8 +46,9 @@ #include "fsengineclient.h" #include "globals.h" #include "lib7z_facade.h" -#include "packagemanagercore.h" #include "messageboxhandler.h" +#include "packagemanagercore.h" +#include "settings.h" #include #include @@ -516,10 +517,22 @@ void Component::languageChanged() void Component::loadTranslations(const QDir &directory, const QStringList &qms) { QDirIterator it(directory.path(), qms, QDir::Files); + const QStringList translations = d->m_core->settings().translations(); + const QString uiLanguage = QLocale().uiLanguages().value(0, QLatin1String("en_us")) + .replace(QLatin1Char('-'), QLatin1Char('_')); while (it.hasNext()) { const QString filename = it.next(); - if (QFileInfo(filename).baseName().toLower() != QLocale().name().toLower()) - continue; + const QString basename = QFileInfo(filename).baseName(); + if (!uiLanguage.startsWith(QFileInfo(filename).baseName(), Qt::CaseInsensitive)) + continue; // do not load the file if it does not match the UI language + + if (!translations.isEmpty()) { + bool found = false; + foreach (const QString &translation, translations) + found |= translation.startsWith(basename, Qt::CaseInsensitive); + if (!found) // don't load the file if it does match the UI language but is not allowed to be used + continue; + } QScopedPointer translator(new QTranslator(this)); if (!translator->load(filename)) diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 8ef248db8..d8f409f46 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -67,6 +67,7 @@ static const QLatin1String scTmpRepositories("TemporaryRepositories"); static const QLatin1String scUninstallerIniFile("UninstallerIniFile"); static const QLatin1String scRemoteRepositories("RemoteRepositories"); static const QLatin1String scDependsOnLocalInstallerBinary("DependsOnLocalInstallerBinary"); +static const QLatin1String scTranslations("Translations"); static const QLatin1String scFtpProxy("FtpProxy"); static const QLatin1String scHttpProxy("HttpProxy"); @@ -97,6 +98,25 @@ static void raiseError(QXmlStreamReader &reader, const QString &error, Settings: } } +static QStringList readTranslations(QXmlStreamReader &reader, Settings::ParseMode parseMode) +{ + QStringList translations; + while (reader.readNextStartElement()) { + if (reader.name() == QLatin1String("Translation")) { + translations.append(reader.readElementText().toLower()); + } else { + raiseError(reader, QString::fromLatin1("Unexpected element '%1'.").arg(reader.name().toString()), + parseMode); + } + + if (!reader.attributes().isEmpty()) { + raiseError(reader, QString::fromLatin1("Unexpected attribute for element '%1'.").arg(reader + .name().toString()), parseMode); + } + } + return translations; +} + static QSet readRepositories(QXmlStreamReader &reader, bool isDefault, Settings::ParseMode parseMode) { QSet set; @@ -212,7 +232,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, << scDependsOnLocalInstallerBinary << scAllowSpaceInPath << scAllowNonAsciiCharacters << scRepositorySettingsPageVisible << scTargetConfigurationFile - << scRemoteRepositories; + << scRemoteRepositories << scTranslations; Settings s; s.d->m_data.insert(scPrefix, prefix); @@ -232,7 +252,9 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, if (s.d->m_data.contains(name)) reader.raiseError(QString::fromLatin1("Element '%1' has been defined before.").arg(name)); - if (name == scRemoteRepositories) { + if (name == scTranslations) { + s.setTranslations(readTranslations(reader, parseMode)); + } else if (name == scRemoteRepositories) { s.addDefaultRepositories(readRepositories(reader, true, parseMode)); } else { s.d->m_data.insert(name, reader.readElementText(QXmlStreamReader::SkipChildElements)); @@ -576,3 +598,17 @@ void Settings::setHttpProxy(const QNetworkProxy &proxy) { d->m_data.insert(scHttpProxy, QVariant::fromValue(proxy)); } + +QStringList Settings::translations() const +{ + const QVariant variant = d->m_data.values(scTranslations); + if (variant.canConvert()) + return variant.value(); + return QStringList(); +} + +void Settings::setTranslations(const QStringList &translations) +{ + d->m_data.remove(scTranslations); + d->m_data.insert(scTranslations, translations); +} diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h index 277264f79..85a2ea68e 100644 --- a/src/libs/installer/settings.h +++ b/src/libs/installer/settings.h @@ -47,6 +47,7 @@ #include #include +#include #include #include @@ -151,6 +152,9 @@ public: QNetworkProxy httpProxy() const; void setHttpProxy(const QNetworkProxy &proxy); + QStringList translations() const; + void setTranslations(const QStringList &translations); + private: class Private; QSharedDataPointer d; -- cgit v1.2.3