From a7e6fe259817780bcc3642e6c1f33e0059c1a6fe Mon Sep 17 00:00:00 2001
From: marvin-borner@live.com
Date: Thu, 12 Apr 2018 21:55:34 +0200
Subject: Fixed some bugs and added translations - nothing special here
---
assets/js/chat.js | 7 +++---
assets/languages/json/Translations.json | 40 +++++++++++++++++++++++++++------
assets/languages/json/de.json | 16 +++++++------
assets/languages/json/en.json | 16 +++++++------
assets/languages/json/fr.json | 14 ++++++++++++
5 files changed, 69 insertions(+), 24 deletions(-)
create mode 100644 assets/languages/json/fr.json
(limited to 'assets')
diff --git a/assets/js/chat.js b/assets/js/chat.js
index 96be014..c715fbd 100644
--- a/assets/js/chat.js
+++ b/assets/js/chat.js
@@ -45,15 +45,16 @@ WebSocket.onmessage = function (e) {
} else if (MessageObject.ServerMessage === true) {
if (MessageObject.ServerMessageType === "GroupJoin") {
if (MessageObject.WasHimself === false) {
- ChatResponses.append(MessageObject.Username + " joined the group. <br>");
+ ChatResponses.append(MessageObject.Username + " <span data-lang='joined the group'></span><br>");
} else if (MessageObject.WasHimself === true) {
ChatResponses.empty();
- ChatResponses.append("You joined the group " + MessageObject.GroupName + ".<br>");
+ ChatResponses.append("<span data-lang='You joined the group'> " + MessageObject.GroupName + "</span>.<br>");
}
} else if (MessageObject.ServerMessageType === "UserDisconnect") {
- ChatResponses.append(MessageObject.Username + " disconnected from the Server.");
+ ChatResponses.append(MessageObject.Username + " <span data-lang='has disconnected from the server'></span><br>");
}
}
+ initiateLanguage(); // need further work (performance)
};
ChatTextInput.keyup(function (e) {
diff --git a/assets/languages/json/Translations.json b/assets/languages/json/Translations.json
index 400ab01..58f9733 100644
--- a/assets/languages/json/Translations.json
+++ b/assets/languages/json/Translations.json
@@ -1,12 +1,38 @@
{
"en": {
- "langcode": "en",
- "Hello": "Hello World!",
- "Yes": "Yes"
+ "Translator": "Marvin Borner",
+ "you": "you",
+ "Feed": "New",
+ "Explore": "Explore",
+ "Chat": "Chat",
+ "Friends": "Friends",
+ "Personal": "Personal",
+ "joined the group": "joined the group",
+ "You joined the group": "You joined the group",
+ "has disconnected from the server": "has disconnected from the server"
+ },
+ "de": {
+ "Translator": "Marvin Borner",
+ "you": "du",
+ "Feed": "Neues",
+ "Explore": "Entdecken",
+ "Chat": "Nachrichten",
+ "Friends": "Freunde",
+ "Personal": "Persönliche Daten",
+ "joined the group": "ist der Gruppe beigetreten",
+ "You joined the group": "Du bist der Gruppe beigetreten",
+ "has disconnected from the server": "hat sich vom Server getrennt"
},
"fr": {
- "langcode": "fr",
- "Hello": "Bonjour à tous!",
- "Yes": "Oui"
+ "Translator": "Marvin Borner (non-french)",
+ "you": "vous",
+ "Feed": "D'actualités",
+ "Explore": "Dépister",
+ "Chat": "Message",
+ "Friends": "Camarades",
+ "Personal": "Personnelles",
+ "joined the group": "s'est joint au groupe",
+ "You joined the group": "Vous avez rejoint le groupe",
+ "has disconnected from the server": "s'est déconnecté du serveur."
}
-}
\ No newline at end of file
+}
diff --git a/assets/languages/json/de.json b/assets/languages/json/de.json
index 443ad74..74d522a 100644
--- a/assets/languages/json/de.json
+++ b/assets/languages/json/de.json
@@ -1,12 +1,14 @@
{
"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"
+ "you": "du",
+ "Feed": "Neues",
+ "Explore": "Entdecken",
+ "Chat": "Nachrichten",
+ "Friends": "Freunde",
+ "Personal": "Persönliche Daten",
+ "joined the group": "ist der Gruppe beigetreten",
+ "You joined the group": "Du bist der Gruppe beigetreten",
+ "has disconnected from the server": "hat sich vom Server getrennt"
}
}
diff --git a/assets/languages/json/en.json b/assets/languages/json/en.json
index fc066df..981bb83 100644
--- a/assets/languages/json/en.json
+++ b/assets/languages/json/en.json
@@ -1,12 +1,14 @@
{
"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"
+ "you": "you",
+ "Feed": "New",
+ "Explore": "Explore",
+ "Chat": "Chat",
+ "Friends": "Friends",
+ "Personal": "Personal",
+ "joined the group": "joined the group",
+ "You joined the group": "You joined the group",
+ "has disconnected from the server": "has disconnected from the server"
}
}
diff --git a/assets/languages/json/fr.json b/assets/languages/json/fr.json
new file mode 100644
index 0000000..5c59619
--- /dev/null
+++ b/assets/languages/json/fr.json
@@ -0,0 +1,14 @@
+{
+ "fr": {
+ "Translator": "Marvin Borner (non-french)",
+ "you": "vous",
+ "Feed": "D'actualités",
+ "Explore": "Dépister",
+ "Chat": "Message",
+ "Friends": "Camarades",
+ "Personal": "Personnelles",
+ "joined the group": "s'est joint au groupe",
+ "You joined the group": "Vous avez rejoint le groupe",
+ "has disconnected from the server": "s'est déconnecté du serveur."
+ }
+}
--
cgit v1.2.3