ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make it build with Qt 5.7, drop commented code

pull/138/head
Michael Zanetti 2019-03-18 23:34:58 +01:00
parent 3d114334e1
commit c18ec356e8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libnymea/translator.cpp
View File

@ -115,11 +115,11 @@ QString Translator::translate(const PluginId &pluginId, const QString &string, c
{
DevicePlugin *plugin = m_deviceManager->plugin(pluginId);
if (!m_translatorContexts.contains(plugin->pluginId()) || !m_translatorContexts.value(plugin->pluginId()).translators.contains(locale)) {
if (!m_translatorContexts.contains(plugin->pluginId()) || !m_translatorContexts.value(plugin->pluginId()).translators.contains(locale.name())) {
loadTranslator(plugin, locale);
}
QTranslator* translator = m_translatorContexts.value(plugin->pluginId()).translators.value(locale);
QTranslator* translator = m_translatorContexts.value(plugin->pluginId()).translators.value(locale.name());
QString translatedString = translator->translate(plugin->pluginName().toUtf8(), string.toUtf8());
return translatedString.isEmpty() ? string : translatedString;
}
@ -130,7 +130,7 @@ void Translator::loadTranslator(DevicePlugin *plugin, const QLocale &locale)
// Create default translator for this plugin
TranslatorContext defaultCtx;
defaultCtx.pluginId = plugin->pluginId();
defaultCtx.translators.insert(QLocale("en_US"), new QTranslator());
defaultCtx.translators.insert("en_US", new QTranslator());
m_translatorContexts.insert(plugin->pluginId(), defaultCtx);
if (locale == QLocale("en_US")) {
return;
@ -189,7 +189,7 @@ void Translator::loadTranslator(DevicePlugin *plugin, const QLocale &locale)
if (!loaded) {
translator = m_translatorContexts.value(plugin->pluginId()).translators.value(QLocale("en_US"));
translator = m_translatorContexts.value(plugin->pluginId()).translators.value("en_US");
}
if (!m_translatorContexts.contains(plugin->pluginId())) {
@ -197,6 +197,6 @@ void Translator::loadTranslator(DevicePlugin *plugin, const QLocale &locale)
ctx.pluginId = plugin->pluginId();
m_translatorContexts.insert(plugin->pluginId(), ctx);
}
m_translatorContexts[plugin->pluginId()].translators.insert(locale, translator);
m_translatorContexts[plugin->pluginId()].translators.insert(locale.name(), translator);
}

2
libnymea/translator.h
View File

@ -25,7 +25,7 @@ private:
struct TranslatorContext {
PluginId pluginId;
QHash<QLocale, QTranslator*> translators;
QHash<QString, QTranslator*> translators;
};
QHash<PluginId, TranslatorContext> m_translatorContexts;
};