diff --git a/public/rgc_website/index.html b/public/rgc_website/index.html index 56345b59444898e1f5f12c2770e1b171efaed0f3..527ad4b61e0e117ac9f67e1ae47b620d742a5329 100644 --- a/public/rgc_website/index.html +++ b/public/rgc_website/index.html @@ -61,9 +61,9 @@ </select> </div> --> - <select class="selectpicker" data-img-src="imgs/flags/226-united-states.png" style="background-color: #cc3125; width: 10em; border-color:#cc3125;" data-width="fit"> - <option class="selectlang" data-img-src="imgs/flags/226-united-states.png" style="background-color: white;">English</option> - <option class="selectlang" data-img-src="imgs/flags/226-united-states.png" style="background-color: white;">Deutsch</option> + <select id="selectpicker1" class="selectpicker" data-img-src="imgs/flags/226-united-states.png" style="background-color: #cc3125; width: 10em; border-color:#cc3125;" data-width="fit"> + <option value='1' class="selectlang" data-img-src="imgs/flags/226-united-states.png" style="background-color: white;">English</option> + <option value='2' class="selectlang" data-img-src="imgs/flags/226-united-states.png" style="background-color: white;">Deutsch</option> </select> <!-- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader" aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation"> diff --git a/public/rgc_website/js/add_content.js b/public/rgc_website/js/add_content.js index 606872c7c28c38f850a2d760231af946fea62691..df50bf96ea1835719f98c4fac4e62160e2863c41 100644 --- a/public/rgc_website/js/add_content.js +++ b/public/rgc_website/js/add_content.js @@ -9,9 +9,9 @@ function addcontent(item){ YouTubeHTML = `<a class="btn btn-sm btn-outline-danger" href="${YouTubelink}">YouTube</a>` } var description = "" - if (lang_setting == "English"){ + if (lang_setting == "1"){ description = item.item.description_en - } else if (lang_setting == "Deutsch"){ + } else if (lang_setting == "2"){ description = item.item.description_de } // Prepare Explore Link diff --git a/public/rgc_website/js/language.js b/public/rgc_website/js/language.js index 2a7769006a3f26e2fc03a99fb05039ff88ad353c..40857a8e529d081428613c75078de7e974f39a9b 100644 --- a/public/rgc_website/js/language.js +++ b/public/rgc_website/js/language.js @@ -16,7 +16,7 @@ $('.selectpicker').change(function(){ // alert($(this).val()); }) -var lang_setting = "English" +var lang_setting = "2" function language(lang){ //Change the language settings of the general Elements diff --git a/public/rgc_website/js/search.js b/public/rgc_website/js/search.js index 1d1373eacc3eadf5ddeb98a40366ee7b3c7d6016..ca6c01b9d806598c9ead27222f83add2960827c0 100644 --- a/public/rgc_website/js/search.js +++ b/public/rgc_website/js/search.js @@ -49,8 +49,23 @@ $(document).ready(function(){ //Do something } }); + var userLang = navigator.language || navigator.userLanguage; + console.log("The language is: " + userLang); + if (userLang.includes("de")){ + console.log(true) + var select1 = document.getElementById('selectpicker1'); + console.log(select1) + select1.value = "2"; + select1.dispatchEvent(new Event('change')); + } }); +// window.onload = function () { +// var e = document.getElementById("selectpicker1"); +// e.value = 2; +// e.dispatchEvent(new Event('change')); +// }; + // searchbar and start search function searchToggle(obj, evt){