diff --git a/libguh/plugin/deviceplugin.cpp b/libguh/plugin/deviceplugin.cpp index c477d976..9654697c 100644 --- a/libguh/plugin/deviceplugin.cpp +++ b/libguh/plugin/deviceplugin.cpp @@ -492,7 +492,9 @@ bool DevicePlugin::setLocale(const QLocale &locale) return true; } - qCWarning(dcDeviceManager()) << "* Could not load translation" << locale.name() << "for plugin" << pluginName(); + if (locale.name() != "en_US") + qCWarning(dcDeviceManager()) << "* Could not load translation" << locale.name() << "for plugin" << pluginName(); + return false; } diff --git a/plugins/deviceplugins/commandlauncher/translations/de_DE.ts b/plugins/deviceplugins/commandlauncher/translations/de_DE.ts index 0147483b..fd922b62 100644 --- a/plugins/deviceplugins/commandlauncher/translations/de_DE.ts +++ b/plugins/deviceplugins/commandlauncher/translations/de_DE.ts @@ -61,7 +61,7 @@ Bashscript launcher The name of the DeviceClass (96044325-a6fb-47c9-9117-f29c3b327978) - Bash-Skrip Launcher + Bash-Skript Launcher diff --git a/server/main.cpp b/server/main.cpp index 6f57ad71..61e947a9 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -135,7 +135,9 @@ int main(int argc, char *argv[]) // check if there are local translations if (!translator.load(QLocale::system(), application.applicationName(), "-", QDir(QCoreApplication::applicationDirPath() + "../../translations/").absolutePath(), ".qm")) if (!translator.load(QLocale::system(), application.applicationName(), "-", GuhSettings::translationsPath(), ".qm")) - qWarning(dcApplication()) << "Could not find guhd translations for" << QLocale::system(); + qWarning(dcApplication()) << "Could not find guhd translations for" << QLocale::system().name() << endl << (QDir(QCoreApplication::applicationDirPath() + "../../translations/").absolutePath()) << endl << GuhSettings::translationsPath(); + + qApp->installTranslator(&translator); diff --git a/server/server.pro b/server/server.pro index 03395f44..cb5ab50a 100644 --- a/server/server.pro +++ b/server/server.pro @@ -13,8 +13,8 @@ QT += sql xml websockets bluetooth LIBS += -L$$top_builddir/libguh/ -lguh # Translations -TRANSLATIONS *= $$top_srcdir/translations/guhd_en_US.ts \ - $$top_srcdir/translations/guhd_de_DE.ts +TRANSLATIONS *= $$top_srcdir/translations/guhd-en_US.ts \ + $$top_srcdir/translations/guhd-de_DE.ts # Update ts files and create translation qm files lrelease.input = TRANSLATIONS diff --git a/translations/guhd_de_DE.ts b/translations/guhd-de_DE.ts similarity index 86% rename from translations/guhd_de_DE.ts rename to translations/guhd-de_DE.ts index db488d4e..0550d460 100644 --- a/translations/guhd_de_DE.ts +++ b/translations/guhd-de_DE.ts @@ -4,7 +4,7 @@ main - + guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, which allows to control a lot of different devices from many different @@ -23,12 +23,12 @@ Szenen undVerhaltensweisen des Systems festzulegen. - + Run guhd in the foreground, not as daemon. Starte guhd im Vordergrund, nicht als Service. - + Debug categories to enable. Prefix with "No" to disable. Warnings from all categories will be printed unless explicitly muted with "NoWarnings". Categories are: @@ -36,12 +36,12 @@ Categories are: Es gibt folgende Kategorien: - + Enables all debug categories. This parameter overrides all debug category parameters. Aktiviere alle Debug-Kategorien. Dieser Parameter überschreibt alle anderen Debug-Kategorien Parameter. - + No such debug category: Diese Debug-Kategorie existiert nicht: diff --git a/translations/guhd-en_US.ts b/translations/guhd-en_US.ts new file mode 100644 index 00000000..8abb35cf --- /dev/null +++ b/translations/guhd-en_US.ts @@ -0,0 +1,50 @@ + + + + + main + + + +guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, +which allows to control a lot of different devices from many different +manufacturers. With the powerful rule engine you are able to connect any +device available in the system and create individual scenes and behaviors +for your environment. + + + +guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, +which allows to control a lot of different devices from many different +manufacturers. With the powerful rule engine you are able to connect any +device available in the system and create individual scenes and behaviors +for your environment. + + + + + + Run guhd in the foreground, not as daemon. + Run guhd in the foreground, not as daemon. + + + + Debug categories to enable. Prefix with "No" to disable. Warnings from all categories will be printed unless explicitly muted with "NoWarnings". + +Categories are: + Debug categories to enable. Prefix with "No" to disable. Warnings from all categories will be printed unless explicitly muted with "NoWarnings". + +Categories are: + + + + Enables all debug categories. This parameter overrides all debug category parameters. + Enables all debug categories. This parameter overrides all debug category parameters. + + + + No such debug category: + No such debug category: + + + diff --git a/translations/guhd_en_US.ts b/translations/guhd_en_US.ts deleted file mode 100644 index 949bde78..00000000 --- a/translations/guhd_en_US.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - main - - - -guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, -which allows to control a lot of different devices from many different -manufacturers. With the powerful rule engine you are able to connect any -device available in the system and create individual scenes and behaviors -for your environment. - - - - - - - Run guhd in the foreground, not as daemon. - - - - - Debug categories to enable. Prefix with "No" to disable. Warnings from all categories will be printed unless explicitly muted with "NoWarnings". - -Categories are: - - - - - Enables all debug categories. This parameter overrides all debug category parameters. - - - - - No such debug category: - - - -