From 0f95bf37d0d0bc854ccc5c137aa59721c22e6e1e Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Sun, 14 Oct 2018 15:36:07 +0200 Subject: [PATCH] Bumped plugins --- plugins/absenceplugin | 2 +- plugins/advancedviewplugin | 2 +- plugins/devtoolsplugin | 2 +- plugins/lunchmealplugin | 2 +- plugins/presenceplugin | 2 +- plugins/profileplugin | 2 +- plugins/reportsplugin | 2 +- plugins/sketchplugin | 2 +- plugins/updaterplugin | 2 +- plugins/weatherplugin | 2 +- plugins/webradioplugin | 2 +- zeiterfassungclient/main.cpp | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/absenceplugin b/plugins/absenceplugin index ff22606..aa5a5c6 160000 --- a/plugins/absenceplugin +++ b/plugins/absenceplugin @@ -1 +1 @@ -Subproject commit ff226068ed76ff9c2a01a2aaa21b7fa21413a55b +Subproject commit aa5a5c62774c9187817b0abde868c8fdb245127b diff --git a/plugins/advancedviewplugin b/plugins/advancedviewplugin index 91f5f71..8994103 160000 --- a/plugins/advancedviewplugin +++ b/plugins/advancedviewplugin @@ -1 +1 @@ -Subproject commit 91f5f719e423cf81c486b3128b12898b5c7de32a +Subproject commit 899410387f30762d27b58c72ce4f5c7ed6b31fa4 diff --git a/plugins/devtoolsplugin b/plugins/devtoolsplugin index 172c482..394905f 160000 --- a/plugins/devtoolsplugin +++ b/plugins/devtoolsplugin @@ -1 +1 @@ -Subproject commit 172c48225f513e1679c0d39dbb32da4727c8891d +Subproject commit 394905f93864d3bcddf542db8fa41cbd5565fc20 diff --git a/plugins/lunchmealplugin b/plugins/lunchmealplugin index dda58d4..747787e 160000 --- a/plugins/lunchmealplugin +++ b/plugins/lunchmealplugin @@ -1 +1 @@ -Subproject commit dda58d464cbdaee4d2a835f3f02dbade01e6f282 +Subproject commit 747787eae9abd578102f39cd9113ffe564cbb84e diff --git a/plugins/presenceplugin b/plugins/presenceplugin index 50cd928..7076e0a 160000 --- a/plugins/presenceplugin +++ b/plugins/presenceplugin @@ -1 +1 @@ -Subproject commit 50cd928ec4b807d1a0e6aeabce4f4483190650c3 +Subproject commit 7076e0a62a1dccc682b697d6b4d3c84c7240bb2a diff --git a/plugins/profileplugin b/plugins/profileplugin index a5aa41f..c6ee180 160000 --- a/plugins/profileplugin +++ b/plugins/profileplugin @@ -1 +1 @@ -Subproject commit a5aa41f85ede03cd52b82afd71a8e492ab42f76c +Subproject commit c6ee1803cd643d17d1943e94509e96c43e737d21 diff --git a/plugins/reportsplugin b/plugins/reportsplugin index 4c797f7..af87cc8 160000 --- a/plugins/reportsplugin +++ b/plugins/reportsplugin @@ -1 +1 @@ -Subproject commit 4c797f7233b133823853166d58c800124aa11a0a +Subproject commit af87cc8b38bf60d1534bdbb5d2cd8ce67ced03ea diff --git a/plugins/sketchplugin b/plugins/sketchplugin index ea005c0..f0170ea 160000 --- a/plugins/sketchplugin +++ b/plugins/sketchplugin @@ -1 +1 @@ -Subproject commit ea005c0cd8c8222cfb577c088d4a0d181757a6c5 +Subproject commit f0170ea87cc52c2f2b2db0eeacb54881b7617d0f diff --git a/plugins/updaterplugin b/plugins/updaterplugin index a9a6234..4846959 160000 --- a/plugins/updaterplugin +++ b/plugins/updaterplugin @@ -1 +1 @@ -Subproject commit a9a6234ca27844d0b0b460af0c2c8c6ed59b8ad8 +Subproject commit 48469594a14b4dd6ae71809203041e3f9b8ce6e4 diff --git a/plugins/weatherplugin b/plugins/weatherplugin index 9cbd921..eca7806 160000 --- a/plugins/weatherplugin +++ b/plugins/weatherplugin @@ -1 +1 @@ -Subproject commit 9cbd921f5fd433923a7921bb6458bc6eaa0c1857 +Subproject commit eca780626956131cb92cfd0e84c9d30adc7e7747 diff --git a/plugins/webradioplugin b/plugins/webradioplugin index e5c20c3..9773625 160000 --- a/plugins/webradioplugin +++ b/plugins/webradioplugin @@ -1 +1 @@ -Subproject commit e5c20c352c2441f93330fe5bec0da02c6414716c +Subproject commit 97736252f4d2ba642860639c9ee0769a5efd8243 diff --git a/zeiterfassungclient/main.cpp b/zeiterfassungclient/main.cpp index b185274..3a360fb 100755 --- a/zeiterfassungclient/main.cpp +++ b/zeiterfassungclient/main.cpp @@ -17,6 +17,8 @@ #include #include +#include "utils/fileutils.h" + #include "zeiterfassungsettings.h" #include "dialogs/languageselectiondialog.h" #include "zeiterfassungapi.h" @@ -39,9 +41,7 @@ QSet plugins; bool loadAndInstallTranslator(QTranslator &translator, const QString &filename) { - static auto dir = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(QStringLiteral("translations")); - - if(!translator.load(QLocale(), filename, QStringLiteral("_"), dir)) + if(!translator.load(QLocale(), filename, QStringLiteral("_"), translationsDir())) { qWarning() << "could not load translation" << filename; return false;