frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos

Browse Source
This commit is contained in:
LordGrey 2023-11-18 20:48:02 +01:00
parent dd9a18aca3
commit 721eef2806
4 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
assets/webconfig/content/update.html
View File

@ -1,68 +1,70 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h3 class="page-header"><i class="fa fa-download fa-fw"></i><span data-i18n="main_menu_update_token">Update</span></h3> <h3 class="page-header"><i class="fa fa-download fa-fw"></i><span data-i18n="main_menu_update_token">Update</span></h3>
<div class="introd"> <div class="introd">
<h4 data-i18n="update_label_intro">Overview about all available Hyperion versions. On top you could update or downgrade your version of Hyperion whenever you want. Sorted from newest to oldest</h4> <h4 data-i18n="update_label_intro">Overview about all available Hyperion versions. On top you could update or downgrade your version of Hyperion whenever you want. Sorted from newest to oldest</h4>
<h4> At the moment the respective install button is disabled. Development is still ongoing here. </h4> <h4> At the moment the respective install button is disabled. Development is still ongoing here. </h4>
<hr /> <hr />
</div> </div>
<h4 id="update_currver"></h4> <h4 id="update_currver"></h4>
<hr> <hr>
<div class="col-lg-12" id="versionlist"> <div class="col-lg-12" id="versionlist">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready( function(error) { $(document).ready(function (error) {
performTranslation(); performTranslation();
getReleases(function (callback){ getReleases(function (callback) {
if(callback) if (callback) {
{ var matches = 0;
var matches = 0; for (var key in window.gitHubVersionList) {
for (var key in window.gitHubVersionList)
{
if(window.gitHubVersionList[key].name == null || window.gitHubVersionList[key].tag_name.includes('rc') || (window.serverConfig.general.watchedVersionBranch == "Stable" && (window.gitHubVersionList[key].tag_name.includes('beta') || window.gitHubVersionList[key].tag_name.includes('alpha'))) || (window.serverConfig.general.watchedVersionBranch == "Beta" && window.gitHubVersionList[key].tag_name.includes('alpha'))) if (window.gitHubVersionList[key].name == null ||
{ window.gitHubVersionList[key].tag_name.includes('rc') ||
continue; (window.serverConfig.general.watchedVersionBranch == "Stable" &&
} (window.gitHubVersionList[key].tag_name.includes('beta') ||
window.gitHubVersionList[key].tag_name.includes('alpha')
var danger; )
var type; ) ||
(window.serverConfig.general.watchedVersionBranch == "Beta"
&& window.gitHubVersionList[key].tag_name.includes('Alpha')
)) {
continue;
}
if (window.gitHubVersionList[key].tag_name.includes('beta')) var danger;
{ var type;
danger = 'warning';
type = 'Beta';
}
else if (window.gitHubVersionList[key].tag_name.includes('alpha'))
{
danger = 'danger';
type = 'Alpha';
}
else
{
danger = 'default';
type = 'Stable';
}
matches++; if (window.gitHubVersionList[key].tag_name.includes('beta')) {
$('#versionlist').append('<div class="col-lg-6"><div class="panel panel-'+ danger +'"><div class="panel-heading"><i class="fa fa-television fa-fw"></i>Hyperion V'+window.gitHubVersionList[key].tag_name+'</div><div class="panel-body"><p><span style="font-weight:bold;">'+$.i18n('update_label_type') + '</span> ' + type + '</p><p><span id="desc" style="font-weight:bold;">'+$.i18n('update_label_description')+'</span> '+DOMPurify.sanitize(marked.parse(window.gitHubVersionList[key].body))+'</p><hr><a class="btn btn-primary" href="'+ window.gitHubVersionList[key].html_url +'" target="_blank"><i class="fa fa-list fa-fw"></i><span style="font-weight:bold;">'+$.i18n('update_button_changelog')+'</span></a><button type="button" class="btn btn-warning pull-right" ' + (window.gitHubVersionList[key].tag_name == window.currentVersion ? "disabled":"disabled") + '><i class="fa fa-download fa-fw"></i>'+$.i18n('update_button_install')+'</button></div></div></div>'); danger = 'warning';
} type = 'Beta';
$('#update_currver').append($.i18n('update_versreminder', currentVersion)); }
else if (window.gitHubVersionList[key].tag_name.includes('alpha')) {
danger = 'danger';
type = 'Alpha';
}
else {
danger = 'default';
type = 'Stable';
}
if (matches == 0) matches++;
$('#versionlist').append($.i18n('update_no_updates_for_branch')); $('#versionlist').append('<div class="col-lg-6"><div class="panel panel-' + danger + '"><div class="panel-heading"><i class="fa fa-television fa-fw"></i>Hyperion V' + window.gitHubVersionList[key].tag_name + '</div><div class="panel-body"><p><span style="font-weight:bold;">' + $.i18n('update_label_type') + '</span> ' + type + '</p><p><span id="desc" style="font-weight:bold;">' + $.i18n('update_label_description') + '</span> ' + DOMPurify.sanitize(marked.parse(window.gitHubVersionList[key].body)) + '</p><hr><a class="btn btn-primary" href="' + window.gitHubVersionList[key].html_url + '" target="_blank"><i class="fa fa-list fa-fw"></i><span style="font-weight:bold;">' + $.i18n('update_button_changelog') + '</span></a><button type="button" class="btn btn-warning pull-right" ' + (window.gitHubVersionList[key].tag_name == window.currentVersion ? "disabled" : "disabled") + '><i class="fa fa-download fa-fw"></i>' + $.i18n('update_button_install') + '</button></div></div></div>');
} }
else $('#update_currver').append($.i18n('update_versreminder', currentVersion));
{
$('#versionlist').append($.i18n('update_error_getting_versions')); if (matches == 0)
} $('#versionlist').append($.i18n('update_no_updates_for_branch'));
}); }
removeOverlay(); else {
}); $('#versionlist').append($.i18n('update_error_getting_versions'));
}
});
removeOverlay();
});
</script> </script>

4
bin/scripts/docker-compile.sh
View File

@ -126,7 +126,7 @@ do
shift shift
BUILD_PLATFORM=$1 BUILD_PLATFORM=$1
;; ;;
--qt5) --qt5)
BUILD_WITH_QT5=true BUILD_WITH_QT5=true
;; ;;
-l|--local) -l|--local)
@ -214,7 +214,7 @@ if [ $ARCHITECTURE != $CURRENT_ARCHITECTURE ]; then
ENTRYPOINT_OPTION= ENTRYPOINT_OPTION=
if [ $CURRENT_ARCHITECTURE != "amd64" ]; then if [ $CURRENT_ARCHITECTURE != "amd64" ]; then
echo "---> Emulation builds can only be executed on linux/amd64, linux/x86_64 platforms, current architecture is ${CURRENT_ARCHITECTURE}" echo "---> Emulation builds can only be executed on linux/amd64, linux/x86_64 platforms, current architecture is ${CURRENT_ARCHITECTURE}"
exit 1 exit 1
fi fi
else else

2
libsrc/leddevice/LedDevice.cpp
View File

@ -360,7 +360,7 @@ int LedDevice::rewriteLEDs()
int LedDevice::writeBlack(int numberOfWrites) int LedDevice::writeBlack(int numberOfWrites)
{ {
Debug(_log, "Set LED strip to black to switch of LEDs"); Debug(_log, "Set LED strip to black to switch LEDs off");
return writeColor(ColorRgb::BLACK, numberOfWrites); return writeColor(ColorRgb::BLACK, numberOfWrites);
} }

2
libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
View File

@ -1301,7 +1301,7 @@ QJsonObject LedDevicePhilipsHueBridge::discover(const QJsonObject& /*params*/)
); );
#else #else
QString discoveryMethod("ssdp"); QString discoveryMethod("ssdp");
deviceList = discover(); deviceList = discoverSsdp();
#endif #endif
devicesDiscovered.insert("discoveryMethod", discoveryMethod); devicesDiscovered.insert("discoveryMethod", discoveryMethod);