From f00f3eb5ad5ea0945bbf9d845883bfc925acdcc9 Mon Sep 17 00:00:00 2001
From: lukeIam <mail2skywalker@gmail.com>
Date: Sun, 1 Dec 2013 13:22:51 +0100
Subject: [PATCH] Webserver: -fix: Messages with dots were not translated -fix:
 request extrenal may not work

---
 Vocaluxe/Website/js/main.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Vocaluxe/Website/js/main.js b/Vocaluxe/Website/js/main.js
index 252a32be..37af5f99 100644
--- a/Vocaluxe/Website/js/main.js
+++ b/Vocaluxe/Website/js/main.js
@@ -1062,12 +1062,13 @@ function request(data, message) {
     }
 
     if (message != "noOverlay") {
+        var message2 = message;
         if (i18n.t) {
-            message = i18n.t(message) || message;
+            message2 = i18n.t(message2);
         }
         $('div[data-role="content"]').wrap('<div class="overlay" />');
         $.mobile.loading('show', {
-            text: message,
+            text: message2,
             textVisible: true
         });
     }
@@ -1306,7 +1307,8 @@ function initTranslation() {
                 'discoverConnectHeader': 'Connect to server',
                 'discoverConnectServerAddress': 'Serveraddress:',
                 'discoverConnectButton': 'Connect',
-                'Checking...': 'Checking...'
+                'Checking...': 'Checking...',
+                'timeout': 'Timeout'
             }
         },
         "de": {
@@ -1386,14 +1388,17 @@ function initTranslation() {
                 'discoverConnectHeader': 'Verbinde zum Server',
                 'discoverConnectServerAddress': 'Serveradresse:',
                 'discoverConnectButton': 'Verbinden',
-                'Checking...': 'Prüfen...'
+                'Checking...': 'Prüfen...',
+                'timeout': 'Zeitüberschreitung'
             }
         }
     };
     $.i18n.init({
         resStore: translations,
         lng: "de",
-        fallbackLng: 'en'
+        fallbackLng: 'en',
+        keyseparator: '::',
+        nsseparator: ':::'
     }).done(function () {
         $('body').i18n();
     });