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

fix guhd translations

pull/135/head
Simon Stürz 2016-08-29 13:23:22 +02:00 committed by Michael Zanetti
parent b53186da19
commit 6ebda18235
7 changed files with 64 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libguh/plugin/deviceplugin.cpp
View File

@ -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;
}

2
plugins/deviceplugins/commandlauncher/translations/de_DE.ts
View File

@ -61,7 +61,7 @@
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/commandlauncher/plugininfo.h" line="59"/>
<source>Bashscript launcher</source>
<extracomment>The name of the DeviceClass (96044325-a6fb-47c9-9117-f29c3b327978)</extracomment>
<translation>Bash-Skrip Launcher</translation>
<translation>Bash-Skript Launcher</translation>
</message>
</context>
</TS>

4
server/main.cpp
View File

@ -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);

4
server/server.pro
View File

@ -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

10
translations/guhd_de_DE.ts → translations/guhd-de_DE.ts
View File

@ -4,7 +4,7 @@
<context>
<name>main</name>
<message>
<location filename="../server/main.cpp" line="145"/>
<location filename="../server/main.cpp" line="147"/>
<source>
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.
</translation>
</message>
<message>
<location filename="../server/main.cpp" line="157"/>
<location filename="../server/main.cpp" line="159"/>
<source>Run guhd in the foreground, not as daemon.</source>
<translation>Starte guhd im Vordergrund, nicht als Service.</translation>
</message>
<message>
<location filename="../server/main.cpp" line="160"/>
<location filename="../server/main.cpp" line="162"/>
<source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;.
Categories are:</source>
@ -36,12 +36,12 @@ Categories are:</source>
Es gibt folgende Kategorien:</translation>
</message>
<message>
<location filename="../server/main.cpp" line="177"/>
<location filename="../server/main.cpp" line="179"/>
<source>Enables all debug categories. This parameter overrides all debug category parameters.</source>
<translation>Aktiviere alle Debug-Kategorien. Dieser Parameter überschreibt alle anderen Debug-Kategorien Parameter.</translation>
</message>
<message>
<location filename="../server/main.cpp" line="197"/>
<location filename="../server/main.cpp" line="199"/>
<source>No such debug category:</source>
<translation>Diese Debug-Kategorie existiert nicht:</translation>
</message>

50
translations/guhd-en_US.ts Normal file
View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en_US">
<context>
<name>main</name>
<message>
<location filename="../server/main.cpp" line="147"/>
<source>
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.
</source>
<translation>
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.
</translation>
</message>
<message>
<location filename="../server/main.cpp" line="159"/>
<source>Run guhd in the foreground, not as daemon.</source>
<translation>Run guhd in the foreground, not as daemon.</translation>
</message>
<message>
<location filename="../server/main.cpp" line="162"/>
<source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;.
Categories are:</source>
<translation>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;.
Categories are:</translation>
</message>
<message>
<location filename="../server/main.cpp" line="179"/>
<source>Enables all debug categories. This parameter overrides all debug category parameters.</source>
<translation>Enables all debug categories. This parameter overrides all debug category parameters.</translation>
</message>
<message>
<location filename="../server/main.cpp" line="199"/>
<source>No such debug category:</source>
<translation>No such debug category:</translation>
</message>
</context>
</TS>

41
translations/guhd_en_US.ts
View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en_US">
<context>
<name>main</name>
<message>
<location filename="../server/main.cpp" line="145"/>
<source>
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.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../server/main.cpp" line="157"/>
<source>Run guhd in the foreground, not as daemon.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../server/main.cpp" line="160"/>
<source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;.
Categories are:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../server/main.cpp" line="177"/>
<source>Enables all debug categories. This parameter overrides all debug category parameters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../server/main.cpp" line="197"/>
<source>No such debug category:</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>