diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json
index fb8241f1..41fbfabb 100644
--- a/assets/webconfig/i18n/de.json
+++ b/assets/webconfig/i18n/de.json
@@ -50,6 +50,7 @@
"dashboard_infobox_label_platform" : "Plattform:",
"dashboard_infobox_label_instance" : "Instanz:",
"dashboard_infobox_label_ports" : "Ports (flat|proto):",
+ "dashboard_infobox_label_versionbranch" : "Versionszweig:",
"dashboard_infobox_message_updatewarning" : "Eine aktuellere Version von Hyperion ist verfügbar! (V$1)",
"dashboard_infobox_message_updatesuccess" : "Du nutzt die aktuellste Version von Hyperion.",
"dashboard_infobox_label_statush" : "Hyperion Status:",
@@ -260,7 +261,7 @@
"about_builddate" : "Build Datum",
"about_translations" : "Übersetzungen",
"about_resources" : "$1 Bibliotheken",
- "about_contribute" : "Übersetze Hyperion in weitere Sprachen!",
+ "about_contribute" : "Entwickel Hyperion mit uns weiter!",
"about_credits" : "Einen Dank an alle Entwickler!",
"info_conlost_label_title" : "Verbindung zum Hyperion Service unterbrochen!",
"info_conlost_label_reason" : "Mögliche Ursachen:",
@@ -438,6 +439,8 @@
"edt_conf_gen_name_expl" : "Der Name wird verwendet, um Hyperion besser zu identifizieren. (Hilfreich bei mehreren Instanzen)",
"edt_conf_gen_showOptHelp_title" : "Zeige Erklärungen",
"edt_conf_gen_showOptHelp_expl" : "Zeige alle verfügbaren Options-Erklärungen. Empfohlen für Anfänger",
+ "edt_conf_gen_versionBranch_title" : "Versionszweig",
+ "edt_conf_gen_versionBranch_expl" : "Gibt an, welcher Versionszweig für die Suche von neuen Hyperion Versionen genutzt werden soll.",
"edt_conf_color_heading_title" : "Farbkalibrierung",
"edt_conf_color_channelAdjustment_header_title" : "Anpassung Farbkanäle",
"edt_conf_color_channelAdjustment_header_itemtitle" : "Profil",
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index d063c41a..bd118cf1 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -50,6 +50,7 @@
"dashboard_infobox_label_platform" : "Platform:",
"dashboard_infobox_label_instance" : "Instance:",
"dashboard_infobox_label_ports" : "Ports (flat|proto):",
+ "dashboard_infobox_label_versionbranch" : "Version Branch:",
"dashboard_infobox_message_updatewarning" : "A newer version of Hyperion is available! ($1)",
"dashboard_infobox_message_updatesuccess" : "You run the latest version of Hyperion.",
"dashboard_infobox_label_statush" : "Hyperion status:",
@@ -60,7 +61,7 @@
"dashboard_componentbox_label_comp" : "Component",
"dashboard_componentbox_label_status" : "Status",
"dashboard_newsbox_label_title" : "Hyperion-Blog",
- "dashboard_newsbox_visitblog" : "Visit Hyperion-Blog",
+ "dashboard_newsbox_visitblog" : "Visit Hyperion-Blog",
"dashboard_newsbox_noconn" : "Can't connect to Hyperion Server to retrieve latest posts, does your internet connection work?",
"dashboard_newsbox_readmore" : "Read more",
"dashboard_alert_message_confedit_t" : "Configuration modified",
@@ -260,7 +261,7 @@
"about_builddate" : "Build date",
"about_translations" : "Translations",
"about_resources" : "$1 libraries",
- "about_contribute" : "Add more languages to Hyperion!",
+ "about_contribute" : "Develop Hyperion further with us!",
"about_credits" : "Credits to all these developers!",
"info_conlost_label_title" : "Lost connection to Hyperion service!",
"info_conlost_label_reason" : "Possible reasons:",
@@ -439,6 +440,8 @@
"edt_conf_gen_name_expl" : "A user defined name which is used to detect Hyperion. (Helpful with more than one Hyperion instance)",
"edt_conf_gen_showOptHelp_title" : "Show explanations",
"edt_conf_gen_showOptHelp_expl" : "Show all available explanations in each section. Highly recommended for beginners!",
+ "edt_conf_gen_versionBranch_title" : "Version Branch",
+ "edt_conf_gen_versionBranch_expl" : "Selects which version branch should be used for searching new Hyperion versions.",
"edt_conf_color_heading_title" : "Color Calibration",
"edt_conf_color_channelAdjustment_header_itemtitle" : "Profile",
"edt_conf_color_channelAdjustment_header_title" : "Color channel adjustments",
diff --git a/assets/webconfig/js/content_dashboard.js b/assets/webconfig/js/content_dashboard.js
index 9fe16518..1af95f27 100644
--- a/assets/webconfig/js/content_dashboard.js
+++ b/assets/webconfig/js/content_dashboard.js
@@ -78,19 +78,28 @@ $(document).ready( function() {
$('#dash_currv').html(window.currentVersion);
$('#dash_instance').html(window.serverConfig.general.name);
$('#dash_ports').html(window.serverConfig.flatbufServer.port+' | '+window.serverConfig.protoServer.port);
+ $('#dash_versionbranch').html(window.serverConfig.general.versionBranch);
$.get( "https://raw.githubusercontent.com/hyperion-project/hyperion.ng/master/version.json", function( data ) {
window.parsedUpdateJSON = JSON.parse(data);
- window.latestVersion = window.parsedUpdateJSON[0].versionnr;
- // var cleanLatestVersion = window.latestVersion.replace(/\./g, '');
- // var cleanCurrentVersion = window.currentVersion.replace(/\./g, '');
+
+ for(let i=0; i
'+$.i18n('dashboard_infobox_message_updatewarning', window.latestVersion)+' ');
- // else
+ if ( cleanCurrentVersion < cleanLatestVersion )
+ $('#versioninforesult').html('
');
});
diff --git a/assets/webconfig/js/settings.js b/assets/webconfig/js/settings.js
index c05c8f65..9278edb9 100644
--- a/assets/webconfig/js/settings.js
+++ b/assets/webconfig/js/settings.js
@@ -21,10 +21,10 @@ $(document).ready( function() {
$.i18n().load( "i18n", lc ).done(
function() {
performTranslation();
- });
+ });
}
}
-
+
if (storageComp())
{
storedLang = getStorage("langcode");
@@ -48,16 +48,16 @@ $(document).ready( function() {
$('#btn_setlang').attr("disabled", true);
$('#btn_setaccess').attr("disabled", true);
}
-
+
$('#btn_setlang').off().on('click',function() {
var newLang;
showInfoDialog('select', $.i18n('InfoDialog_lang_title'), $.i18n('InfoDialog_lang_text'));
-
+
for (var lcx = 0; lcx