From 6d300e1110c4ff060b4dee29441dd471208c2ded Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sat, 11 Jan 2014 12:12:04 -0500 Subject: [PATCH] updated chat i18n strings to use new modules.json file, added said files to language dirs --- public/language/de/footer.json | 3 --- public/language/en/footer.json | 3 --- public/language/es/footer.json | 3 --- public/language/fr/footer.json | 3 --- public/language/it/footer.json | 3 --- public/src/forum/footer.js | 15 ++++++++++----- public/templates/chat.tpl | 6 +++--- 7 files changed, 13 insertions(+), 23 deletions(-) diff --git a/public/language/de/footer.json b/public/language/de/footer.json index adf674ca29..eef4e0d8c7 100644 --- a/public/language/de/footer.json +++ b/public/language/de/footer.json @@ -1,7 +1,4 @@ { - "chat.chatting_with": "Chatten mit ", - "chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden", - "chat.send": "Senden", "stats.online": "Online", "stats.users": "Benutzer", "stats.topics": "Themen", diff --git a/public/language/en/footer.json b/public/language/en/footer.json index a1270d4ea4..aa6df817da 100644 --- a/public/language/en/footer.json +++ b/public/language/en/footer.json @@ -1,7 +1,4 @@ { - "chat.chatting_with": "Chat with ", - "chat.placeholder": "type chat message here, press enter to send", - "chat.send": "Send", "stats.online": "Online", "stats.users": "Users", "stats.topics": "Topics", diff --git a/public/language/es/footer.json b/public/language/es/footer.json index eeb962b234..6e222a6b58 100644 --- a/public/language/es/footer.json +++ b/public/language/es/footer.json @@ -1,7 +1,4 @@ { - "chat.chatting_with": "Chatear con ", - "chat.placeholder": "ingresa tu mensaje aqui, y presiona enter para enviar", - "chat.send": "Enviar", "stats.online": "Online", "stats.users": "Usuarios", "stats.topics": "Temas", diff --git a/public/language/fr/footer.json b/public/language/fr/footer.json index 27a4d0e1a9..c04de317bf 100644 --- a/public/language/fr/footer.json +++ b/public/language/fr/footer.json @@ -1,7 +1,4 @@ { - "chat.chatting_with": "Chat avec ", - "chat.placeholder": "taper le message ici, presser entrer pour envoyer", - "chat.send": "Envoyer", "stats.online": "Online", "stats.users": "Utilisateurs", "stats.topics": "Sujets", diff --git a/public/language/it/footer.json b/public/language/it/footer.json index 542e090a96..a91e4e67c6 100644 --- a/public/language/it/footer.json +++ b/public/language/it/footer.json @@ -1,7 +1,4 @@ { - "chat.chatting_with": "Chatta con ", - "chat.placeholder": "scrivi un messaggio qui e premi Invio", - "chat.send": "Invia", "stats.online": "Online", "stats.users": "Utenti", "stats.topics": "Discussioni", diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index 959c33592a..04b08013ef 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -151,13 +151,18 @@ chatsFrag.appendChild(chatEl.cloneNode(true)); } + + chatsListEl.empty(); + chatsListEl.html(chatsFrag); } else { - chatEl.innerHTML = 'No Recent Chats'; - chatsFrag.appendChild(chatEl.cloneNode(true)); - } + translator.get('modules:chat.no_active', function(str) { + chatEl.innerHTML = '' + str + ''; + chatsFrag.appendChild(chatEl.cloneNode(true)); - chatsListEl.empty(); - chatsListEl.html(chatsFrag); + chatsListEl.empty(); + chatsListEl.html(chatsFrag); + }); + } }); }); diff --git a/public/templates/chat.tpl b/public/templates/chat.tpl index d32f3b0da5..c71df40147 100644 --- a/public/templates/chat.tpl +++ b/public/templates/chat.tpl @@ -4,14 +4,14 @@