From f79f7d062ad8dcf89116da8faba456c4519d3d2a Mon Sep 17 00:00:00 2001 From: marvin-borner@live.com Date: Thu, 12 Apr 2018 19:21:00 +0200 Subject: Finalized multilanguage support -- need to add text etc --- TestEncryption.php | 39 ----------------- assets/js/chat.js | 2 +- assets/js/language.js | 36 ++++++++++++++++ assets/js/main.js | 47 +++++++++++---------- assets/languages/ExcelFile.xls | Bin 0 -> 54784 bytes assets/languages/json/Translations.json | 12 ++++++ assets/languages/json/de.json | 12 ++++++ assets/languages/json/en.json | 12 ++++++ .../vendor/nubs/random-name-generator/build.php | 0 .../vendor/paragonie/random_compat/build-phar.sh | 0 assets/php/vendor/react/event-loop/travis-init.sh | 0 index.php | 12 ++++++ 12 files changed, 109 insertions(+), 63 deletions(-) delete mode 100644 TestEncryption.php create mode 100644 assets/js/language.js create mode 100644 assets/languages/ExcelFile.xls create mode 100644 assets/languages/json/Translations.json create mode 100644 assets/languages/json/de.json create mode 100644 assets/languages/json/en.json mode change 100755 => 100644 assets/php/vendor/nubs/random-name-generator/build.php mode change 100755 => 100644 assets/php/vendor/paragonie/random_compat/build-phar.sh mode change 100755 => 100644 assets/php/vendor/react/event-loop/travis-init.sh diff --git a/TestEncryption.php b/TestEncryption.php deleted file mode 100644 index 097b727..0000000 --- a/TestEncryption.php +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Document - - - - - - - - - \ No newline at end of file diff --git a/assets/js/chat.js b/assets/js/chat.js index 9acff1d..96be014 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -2,7 +2,7 @@ GENERATE KEYS ************/ if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { - // GENERATE + // GENERATE -- LATER ON LOGIN! var EncryptionPhrase = "PASSWORD 123"; // THE USERS PASSWORD var RSABitLength = 1024; var PrivateKeyString = cryptico.generateRSAKey(EncryptionPhrase, RSABitLength); diff --git a/assets/js/language.js b/assets/js/language.js new file mode 100644 index 0000000..9448ae3 --- /dev/null +++ b/assets/js/language.js @@ -0,0 +1,36 @@ +function Translate() { + //initialization + this.init = function (lng) { + this.attribute = 'data-lang'; + this.lng = lng; + }; + //translate + this.process = function () { + var _self = this; + var xrhFile = new XMLHttpRequest(); + //load content data + xrhFile.open("GET", "assets/languages/json/Translations.json", true); + xrhFile.onreadystatechange = function () { + if (xrhFile.readyState === 4) { + if (xrhFile.status === 200 || xrhFile.status === 0) { + var LngObject = JSON.parse(xrhFile.responseText); + var allDom = document.getElementsByTagName("*"); + for (var i = 0; i < allDom.length; i++) { + var elem = allDom[i]; + var key = elem.getAttribute(_self.attribute); + + if (key != null) { + console.log("Language initialized with language pack: " + _self.lng); + elem.innerHTML = LngObject[_self.lng][key]; + } + } + } + } + }; + xrhFile.send(); + } +} + +$(document).ready(function () { + initiateLanguage(); +}); diff --git a/assets/js/main.js b/assets/js/main.js index aa0f76b..1aefdf4 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -1,33 +1,34 @@ -/***** -NAVBAR -*****/ -var $el, leftPos, newWidth, - $mainNav = $(".Navbar"); -$mainNav.append(""); -var $magicLine = $(".NavbarLine"); -$magicLine +var MainTabWindows = $(".MainTabWindows"); +var NavbarIconWrap = $(".NavbarIconWrap"); +var Navbar = $(".Navbar"); +var NavbarLine = $(".NavbarLine"); + +/****** + NAVBAR + *****/ +var $el, leftPos, newWidth; +NavbarLine .css("left", $(".ActiveTab").position().left) - .data("origLeft", $magicLine.position().left) - .data("origWidth", $magicLine.width()); -$(".NavbarIconWrap").on("click", function () { - $(".NavbarIconWrap").removeClass("ActiveTab"); + .data("origLeft", NavbarLine.position().left) + .data("origWidth", NavbarLine.width()); +NavbarIconWrap.on("click", function () { + NavbarIconWrap.removeClass("ActiveTab"); $(this).addClass("ActiveTab"); var index = $(this).attr('id'); - $('.MainTabWindows').slick('slickGoTo',index); + MainTabWindows.slick('slickGoTo', index); //$('.MainTabWindows').flickity().flickity('select', index); - $el = $(this); leftPos = $el.position().left; - $magicLine.stop().animate({ + NavbarLine.stop().animate({ left: leftPos, - width: newWidth, + width: newWidth }, 300); }); -/******* -FLICKITY -*******/ -$('.MainTabWindows').slick({ +/******** + FLICKITY + *******/ +MainTabWindows.slick({ initialSlide: 2, mobileFirst: true, nextArrow: "", @@ -36,13 +37,13 @@ $('.MainTabWindows').slick({ zIndex: 500 }); -$('.MainTabWindows').on('beforeChange', function(event, slick, currentSlide, nextSlide){ +MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlide) { //console.log(nextSlide); - $(".NavbarIconWrap").removeClass("ActiveTab"); + NavbarIconWrap.removeClass("ActiveTab"); $el = $("#" + nextSlide); $el.addClass("ActiveTab"); leftPos = $el.position().left; - $magicLine.stop().animate({ + NavbarLine.stop().animate({ left: leftPos, width: newWidth }, 300); diff --git a/assets/languages/ExcelFile.xls b/assets/languages/ExcelFile.xls new file mode 100644 index 0000000..98cfe1d Binary files /dev/null and b/assets/languages/ExcelFile.xls differ diff --git a/assets/languages/json/Translations.json b/assets/languages/json/Translations.json new file mode 100644 index 0000000..400ab01 --- /dev/null +++ b/assets/languages/json/Translations.json @@ -0,0 +1,12 @@ +{ + "en": { + "langcode": "en", + "Hello": "Hello World!", + "Yes": "Yes" + }, + "fr": { + "langcode": "fr", + "Hello": "Bonjour à tous!", + "Yes": "Oui" + } +} \ No newline at end of file diff --git a/assets/languages/json/de.json b/assets/languages/json/de.json new file mode 100644 index 0000000..443ad74 --- /dev/null +++ b/assets/languages/json/de.json @@ -0,0 +1,12 @@ +{ + "de": { + "Translator": "Marvin Borner", + "Reset all values": "Möchten Sie alle Angaben zurücksetzen?", + "Yes": "Ja", + "No": "Nein", + "Room temperature": "Raum Temperatur", + "Length": "Länge", + "Width": "Breite", + "Height": "Width" + } +} diff --git a/assets/languages/json/en.json b/assets/languages/json/en.json new file mode 100644 index 0000000..fc066df --- /dev/null +++ b/assets/languages/json/en.json @@ -0,0 +1,12 @@ +{ + "en": { + "Translator": "Marvin Borner", + "Reset all values": "Reset all values to default values?", + "Yes": "Yes", + "No": "No", + "Room temperature": "Room temperature", + "Length": "Length", + "Width": "Width", + "Height": "Height" + } +} diff --git a/assets/php/vendor/nubs/random-name-generator/build.php b/assets/php/vendor/nubs/random-name-generator/build.php old mode 100755 new mode 100644 diff --git a/assets/php/vendor/paragonie/random_compat/build-phar.sh b/assets/php/vendor/paragonie/random_compat/build-phar.sh old mode 100755 new mode 100644 diff --git a/assets/php/vendor/react/event-loop/travis-init.sh b/assets/php/vendor/react/event-loop/travis-init.sh old mode 100755 new mode 100644 diff --git a/index.php b/index.php index bdadeba..fe582b5 100644 --- a/index.php +++ b/index.php @@ -54,6 +54,7 @@
+
@@ -101,10 +102,21 @@
+
+ + + -- cgit v1.2.3