From 08ab27fa06c4c2ab86b717a8f8401ad8ac423445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20Wiedemann?= Date: Thu, 1 May 2014 09:08:19 +0200 Subject: [PATCH 1/2] - added multi-language support --- js/main.js | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/js/main.js b/js/main.js index 9eb22ba18c..50f59f1c56 100644 --- a/js/main.js +++ b/js/main.js @@ -46,6 +46,31 @@ jQuery(document).ready(function($) { var lastCompliment; var compliment; + // multi-langugage support according to browser-lang + var lang = window.navigator.language; + switch (lang) + { + case 'de': + var days = ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag']; + var months = ['Januar','Februar','März','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember']; + var dayAbbr = ['So','Mo','Di','Mi','Do','Fr','Sa']; + var tomorrow = 'morgen'; + var in_days = 'tage'; + break; + case 'nl': + var days = ['zondag','maandag','dinsdag','woensdag','donderdag','vrijdag','zaterdag']; + var months = ['januari','februari','maart','april','mei','juni','juli','augustus','september','oktober','november','december']; + var dayAbbr = ['zo','ma','di','wo','do','vr','za']; + var tomorrow = 'morgen'; + var in_days = 'dagen'; + break; + default: + var days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']; + var months = ['january','february','march','april','may','june','july','august','september','oktober','november','december']; + var dayAbbr = ['su','mo','tu','we','th','fr','sa']; + var tomorrow = 'tomorrow'; + var in_days = 'days'; + } //connect do Xbee monitor var socket = io.connect('http://rpi-development.local:8080'); @@ -83,9 +108,6 @@ jQuery(document).ready(function($) { (function updateTime() { - var days = ['zondag','maandag','dinsdag','woensdag','donderdag','vrijdag','zaterdag']; - var months = ['januari','februari','maart','april','mei','juni','juli','augustus','september','oktober','november','december']; - var now = new Date(); var day = now.getDay(); @@ -161,7 +183,7 @@ jQuery(document).ready(function($) { var e = eventList[i]; var days = e.days; - var daysString = (days == 1) ? 'morgen' : days + ' dagen'; + var daysString = (days == 1) ? tomorrow : days + ' ' + in_days; if (days == 0) { daysString = 'vandaag'; } @@ -268,8 +290,6 @@ jQuery(document).ready(function($) { (function updateWeatherForecast() { - var dayAbbr = ['zo','ma','di','wo','do','vr','za']; - $.getJSON('http://api.openweathermap.org/data/2.5/forecast', weatherParams, function(json, textStatus) { var forecastData = {}; From 34716029052062cee3206a7d62cb37373bdea442 Mon Sep 17 00:00:00 2001 From: Andre Wiedemann Date: Thu, 1 May 2014 09:37:19 +0200 Subject: [PATCH 2/2] - fixed typo in german translation of days - added window.language as param to call weather service --- js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/main.js b/js/main.js index 50f59f1c56..e789263537 100644 --- a/js/main.js +++ b/js/main.js @@ -55,7 +55,7 @@ jQuery(document).ready(function($) { var months = ['Januar','Februar','März','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember']; var dayAbbr = ['So','Mo','Di','Mi','Do','Fr','Sa']; var tomorrow = 'morgen'; - var in_days = 'tage'; + var in_days = 'Tage'; break; case 'nl': var days = ['zondag','maandag','dinsdag','woensdag','donderdag','vrijdag','zaterdag']; @@ -88,7 +88,7 @@ jQuery(document).ready(function($) { var weatherParams = { 'q':'Baarn,Netherlands', 'units':'metric', - 'lang':'nl' + 'lang':lang }; (function checkVersion()