From ae126996fc232e4936c5865e07beb260bcdcd670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ro=CC=88hers=20Moura?= Date: Tue, 19 Jul 2016 13:54:39 -0300 Subject: [PATCH 1/6] added name/link of channel/room in email notifications --- packages/rocketchat-lib/server/lib/sendEmailOnMessage.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js index 9bceae5277e0..3a676001bcc5 100644 --- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js +++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js @@ -28,8 +28,13 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { }); } - // code duplicate of packages/rocketchat-ui-message/message/message.coffee - message.html = s.escapeHTML(message.msg); + var channelRoom = `${process.env.ROOT_URL}channel/${room.name}` + var linkChannelRoom = `#${room.name}`; + var messageUrl = `${ emailSubject.replace(`#${room.name}`, linkChannelRoom) }`; + var divisorMessage = '
'; + + message.html = messageUrl + divisorMessage + s.escapeHTML(message.msg); + message = RocketChat.callbacks.run('renderMessage', message); if (message.tokens && message.tokens.length > 0) { message.tokens.forEach((token) => { From 0ff90e02ae64591bf7f8808497d51da3dda77ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ro=CC=88hers=20Moura?= Date: Wed, 20 Jul 2016 02:38:38 -0300 Subject: [PATCH 2/6] added semicolon --- packages/rocketchat-lib/server/lib/sendEmailOnMessage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js index 3a676001bcc5..205d7b600da2 100644 --- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js +++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js @@ -28,7 +28,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { }); } - var channelRoom = `${process.env.ROOT_URL}channel/${room.name}` + var channelRoom = `${process.env.ROOT_URL}channel/${room.name}`; var linkChannelRoom = `#${room.name}`; var messageUrl = `${ emailSubject.replace(`#${room.name}`, linkChannelRoom) }`; var divisorMessage = '
'; From 090c07e5aae64280bd2ea86d793ee267211e76ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ro=CC=88hers=20Moura?= Date: Wed, 20 Jul 2016 20:28:25 -0300 Subject: [PATCH 3/6] Site_Name removed from Offline_DM_Email and Offline_Mention_Email i18n files --- packages/rocketchat-lib/i18n/ar.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ca.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/cs.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/de-AT.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/de.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/el.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/en.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/es.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/fa.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/fi.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/fr.i18n.json | 2 +- packages/rocketchat-lib/i18n/he.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/hr.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/hu.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/id.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/it.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ja.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/km.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ko.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ku.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/lo.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ms-MY.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/nl.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/pl.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/pt.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ro.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ru.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/sq.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/sr.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/sv.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/ta-IN.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/tr.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/uk.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/zh-TW.i18n.json | 4 ++-- packages/rocketchat-lib/i18n/zh.i18n.json | 4 ++-- 35 files changed, 69 insertions(+), 69 deletions(-) diff --git a/packages/rocketchat-lib/i18n/ar.i18n.json b/packages/rocketchat-lib/i18n/ar.i18n.json index 73b6e4e1c845..3fbcf336e2a1 100644 --- a/packages/rocketchat-lib/i18n/ar.i18n.json +++ b/packages/rocketchat-lib/i18n/ar.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "خارج على تسجيل المحادثة", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "المحادثة السرية غير متوفرة لمتصفحك أو جهازك", "Offline" : "غير متصل", - "Offline_DM_Email" : "[__site__] لقد تم بعث برسالة مباشرة من قبل __user__", + "Offline_DM_Email" : "لقد تم بعث برسالة مباشرة من قبل __user__", "Offline_form" : "شكل متواجد حاليا", "Offline_form_unavailable_message" : "شكل متواجد حاليا رسالة غير متوفرة", - "Offline_Mention_Email" : "[__site__] تم التنويه باسمك بواسطة __user__ في #__room__", + "Offline_Mention_Email" : "تم التنويه باسمك بواسطة __user__ في #__room__", "Offline_message" : "رسالة متواجد حاليا", "Offline_success_message" : "رسالة نجاح متواجد حاليا", "Offline_unavailable" : "غير متوفر حاليا", diff --git a/packages/rocketchat-lib/i18n/ca.i18n.json b/packages/rocketchat-lib/i18n/ca.i18n.json index eb2558344b68..756ceb5c6ae0 100644 --- a/packages/rocketchat-lib/i18n/ca.i18n.json +++ b/packages/rocketchat-lib/i18n/ca.i18n.json @@ -778,10 +778,10 @@ "Off_the_record_conversation" : "Conversa sense registre (off-the-record)", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "La conversa sense registre no està disponible per al teu navegador o dispositiu.", "Offline" : "Fora de línia", - "Offline_DM_Email" : "[__site__] __user__ us ha enviat un missatge directe", + "Offline_DM_Email" : "__user__ us ha enviat un missatge directe", "Offline_form" : "formulari en línia", "Offline_form_unavailable_message" : "Missatge de formulari fora de línia no disponible", - "Offline_Mention_Email" : "[__site__] __user__ us ha mencionat a la sala #__room__", + "Offline_Mention_Email" : "__user__ us ha mencionat a la sala #__room__", "Offline_message" : "missatge fora de línia", "Offline_success_message" : "Missatge fora de línia correcte", "Offline_unavailable" : "Fora de línia no disponible", diff --git a/packages/rocketchat-lib/i18n/cs.i18n.json b/packages/rocketchat-lib/i18n/cs.i18n.json index 9bc9968e8ed0..15fbe482e9bf 100644 --- a/packages/rocketchat-lib/i18n/cs.i18n.json +++ b/packages/rocketchat-lib/i18n/cs.i18n.json @@ -778,10 +778,10 @@ "Off_the_record_conversation" : "Konverzace mimo záznam", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Konverzace mimo záznam není k dispozici pro Váš prohlížeč nebo zařízení.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] přímá zpráva od __user__", + "Offline_DM_Email" : "přímá zpráva od __user__", "Offline_form" : "Offline formulář", "Offline_form_unavailable_message" : "Zpráva nedostupného offline formuláře", - "Offline_Mention_Email" : "[__site__] zmínka od __user__ v #__room__", + "Offline_Mention_Email" : "zmínka od __user__ v #__room__", "Offline_message" : "Offline zprávy", "Offline_success_message" : "Zpráva pro offline úspěšnou akci", "Offline_unavailable" : "Offline nedostupný", diff --git a/packages/rocketchat-lib/i18n/de-AT.i18n.json b/packages/rocketchat-lib/i18n/de-AT.i18n.json index 9731376e61ad..100638a4b470 100644 --- a/packages/rocketchat-lib/i18n/de-AT.i18n.json +++ b/packages/rocketchat-lib/i18n/de-AT.i18n.json @@ -761,10 +761,10 @@ "Off_the_record_conversation" : "Off-the-record-Gespräche", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record-Gespräche sind für Ihren Browser oder Ihr Gerät nicht verfügbar.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Private Nachricht von __user__ erhalten.", + "Offline_DM_Email" : "Private Nachricht von __user__ erhalten.", "Offline_form" : "Offline-Formular", "Offline_form_unavailable_message" : "Nachricht, dass Offline Formular ungültig", - "Offline_Mention_Email" : "[__site__] Erwähnung durch __user__ in #__room__.", + "Offline_Mention_Email" : "Erwähnung durch __user__ in #__room__.", "Offline_message" : "Offline-Nachricht", "Offline_success_message" : "Nachricht, dass Offline Nachricht erfolgreich", "Offline_unavailable" : "offline - nicht verfügbar", diff --git a/packages/rocketchat-lib/i18n/de.i18n.json b/packages/rocketchat-lib/i18n/de.i18n.json index a1d345f77d2f..201d1635cc18 100644 --- a/packages/rocketchat-lib/i18n/de.i18n.json +++ b/packages/rocketchat-lib/i18n/de.i18n.json @@ -774,10 +774,10 @@ "Off_the_record_conversation" : "Off-the-record-Gespräche", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record-Gespräche sind für Ihren Browser oder Ihr Gerät nicht verfügbar.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Sie haben eine private Nachricht von __user__ erhalten.", + "Offline_DM_Email" : "Sie haben eine private Nachricht von __user__ erhalten.", "Offline_form" : "Offline-Formular", "Offline_form_unavailable_message" : "Nachricht, dass Offline Formular ungültig", - "Offline_Mention_Email" : "[__site__] Sie wurden von __user__ in #__room__ erwähnt.", + "Offline_Mention_Email" : "Sie wurden von __user__ in #__room__ erwähnt.", "Offline_message" : "Offline-Nachricht", "Offline_success_message" : "Nachricht, dass Offline Nachricht erfolgreich", "Offline_unavailable" : "offline - nicht verfügbar", diff --git a/packages/rocketchat-lib/i18n/el.i18n.json b/packages/rocketchat-lib/i18n/el.i18n.json index 979ae9ce7cb0..68ae061eaed8 100644 --- a/packages/rocketchat-lib/i18n/el.i18n.json +++ b/packages/rocketchat-lib/i18n/el.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-record συνομιλία", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record συνομιλία δεν είναι διαθέσιμη για το πρόγραμμα περιήγησης ή τη συσκευή σας.", "Offline" : "offline", - "Offline_DM_Email" : "[__site__] Σας έχουν άμεση ειδοποιήται από __user__", + "Offline_DM_Email" : "Σας έχουν άμεση ειδοποιήται από __user__", "Offline_form" : "offline μορφή", "Offline_form_unavailable_message" : "Offline μορφή διαθέσιμη μήνυμα", - "Offline_Mention_Email" : "[__site__] Έχετε αναφερθεί από __user__ στην #__room__", + "Offline_Mention_Email" : "Έχετε αναφερθεί από __user__ στην #__room__", "Offline_message" : "offline μήνυμα", "Offline_success_message" : "Offline μήνυμα επιτυχίας", "Offline_unavailable" : "offline διαθέσιμη", diff --git a/packages/rocketchat-lib/i18n/en.i18n.json b/packages/rocketchat-lib/i18n/en.i18n.json index 81ee546c53e9..2d62cbfba05c 100644 --- a/packages/rocketchat-lib/i18n/en.i18n.json +++ b/packages/rocketchat-lib/i18n/en.i18n.json @@ -779,10 +779,10 @@ "Off_the_record_conversation" : "Off-the-record Conversation", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record conversation is not available for your browser or device.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] You have been direct messaged by __user__", + "Offline_DM_Email" : "You have been direct messaged by __user__", "Offline_form" : "Offline form", "Offline_form_unavailable_message" : "Offline form unavailable message", - "Offline_Mention_Email" : "[__site__] You have been mentioned by __user__ in #__room__", + "Offline_Mention_Email" : "You have been mentioned by __user__ in #__room__", "Offline_message" : "Offline message", "Offline_success_message" : "Offline success message", "Offline_unavailable" : "Offline unavailable", diff --git a/packages/rocketchat-lib/i18n/es.i18n.json b/packages/rocketchat-lib/i18n/es.i18n.json index 3eae72cca3ae..c7e1d8cf96d9 100644 --- a/packages/rocketchat-lib/i18n/es.i18n.json +++ b/packages/rocketchat-lib/i18n/es.i18n.json @@ -776,10 +776,10 @@ "Off_the_record_conversation" : "Off-the-record Conversación", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record conversación no está disponible para el navegador o dispositivo.", "Offline" : "Desconectado", - "Offline_DM_Email" : "[__site__] Se le ha contactado directamente por __user__", + "Offline_DM_Email" : "Se le ha contactado directamente por __user__", "Offline_form" : "formulario en línea", "Offline_form_unavailable_message" : "formulario en línea mensaje inasequible", - "Offline_Mention_Email" : "[__site__] Usted ha sido mencionado por __user__ en #__room__", + "Offline_Mention_Email" : "Usted ha sido mencionado por __user__ en #__room__", "Offline_message" : "mensaje fuera de línea", "Offline_success_message" : "Mensaje fuera de línea correcto", "Offline_unavailable" : "disponible sin conexión", diff --git a/packages/rocketchat-lib/i18n/fa.i18n.json b/packages/rocketchat-lib/i18n/fa.i18n.json index 912287147ffc..ceb2322e613b 100644 --- a/packages/rocketchat-lib/i18n/fa.i18n.json +++ b/packages/rocketchat-lib/i18n/fa.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "خارج از رکورد مکالمات", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "خارج از ضبط مکالمات برای مرورگر یا دستگاه شما در دسترس نیست.", "Offline" : "آفلاین", - "Offline_DM_Email" : "[__site__] شما مستقیم توسط __user__ پیام ارسال شده است", + "Offline_DM_Email" : "شما مستقیم توسط __user__ پیام ارسال شده است", "Offline_form" : "فرم آفلاین", "Offline_form_unavailable_message" : "آفلاین فرم پیام در دسترس نیست", - "Offline_Mention_Email" : "[__site__] شما توسط __user__ در #__room__ ذکر شده است", + "Offline_Mention_Email" : "شما توسط __user__ در #__room__ ذکر شده است", "Offline_message" : "آفلاین", "Offline_success_message" : "پیام موفقیت آفلاین", "Offline_unavailable" : "آفلاین در دسترس نیست", diff --git a/packages/rocketchat-lib/i18n/fi.i18n.json b/packages/rocketchat-lib/i18n/fi.i18n.json index 6af656cc8426..321495060395 100644 --- a/packages/rocketchat-lib/i18n/fi.i18n.json +++ b/packages/rocketchat-lib/i18n/fi.i18n.json @@ -778,10 +778,10 @@ "Off_the_record_conversation" : "Off-the-record Keskustelu", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record keskustelu ei ole käytettävissä selaimellasi tai laitteellasi.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] __user__ lähetti sinulle yksityisviestin", + "Offline_DM_Email" : "__user__ lähetti sinulle yksityisviestin", "Offline_form" : "Poissa muoto", "Offline_form_unavailable_message" : "Poissa muoto käytettävissä viesti", - "Offline_Mention_Email" : "[__site__] __user__ mainitsi sinut huoneessa #__room__", + "Offline_Mention_Email" : "__user__ mainitsi sinut huoneessa #__room__", "Offline_message" : "Poissa viesti", "Offline_success_message" : "Poissa menestys viesti", "Offline_unavailable" : "Poissa käytettävissä", diff --git a/packages/rocketchat-lib/i18n/fr.i18n.json b/packages/rocketchat-lib/i18n/fr.i18n.json index 694be2c03778..f9b4012302f2 100644 --- a/packages/rocketchat-lib/i18n/fr.i18n.json +++ b/packages/rocketchat-lib/i18n/fr.i18n.json @@ -765,7 +765,7 @@ "Offline_DM_Email" : "|__site__] Vous avez reçu des messages privés de __user__", "Offline_form" : "forme Hors ligne", "Offline_form_unavailable_message" : "forme Offline Message indisponible", - "Offline_Mention_Email" : "[__site__] Vous avez été mentionné par __user__ dans le salon #__room__", + "Offline_Mention_Email" : "Vous avez été mentionné par __user__ dans le salon #__room__", "Offline_message" : "un message Hors ligne", "Offline_success_message" : "message de succès hors ligne", "Offline_unavailable" : "Offline indisponible", diff --git a/packages/rocketchat-lib/i18n/he.i18n.json b/packages/rocketchat-lib/i18n/he.i18n.json index bdb2d8dd7625..1027387ec7ef 100644 --- a/packages/rocketchat-lib/i18n/he.i18n.json +++ b/packages/rocketchat-lib/i18n/he.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-שיא השיחה", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-שיא השיחה אינה זמינה בדפדפן או במכשיר שלך.", "Offline" : "מנותק", - "Offline_DM_Email" : "[__site__] קבלת הודעות במשך ישיר על ידי __user__", + "Offline_DM_Email" : "קבלת הודעות במשך ישיר על ידי __user__", "Offline_form" : "טופס מנותק", "Offline_form_unavailable_message" : "טופס מנותק הודעה זמינה", - "Offline_Mention_Email" : "[__site__] אתה הוזכרת על ידי __user__ ב #__room__", + "Offline_Mention_Email" : "אתה הוזכרת על ידי __user__ ב #__room__", "Offline_message" : "הודעה מנותקת", "Offline_success_message" : "הודעת הצלחה מנותקת", "Offline_unavailable" : "זמין מנותק", diff --git a/packages/rocketchat-lib/i18n/hr.i18n.json b/packages/rocketchat-lib/i18n/hr.i18n.json index 316d37c79e98..b155e8de3748 100644 --- a/packages/rocketchat-lib/i18n/hr.i18n.json +++ b/packages/rocketchat-lib/i18n/hr.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-zabilježenih razgovora", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record razgovor nije dostupno za vaš preglednik ili uređaj.", "Offline" : "offline", - "Offline_DM_Email" : "[__site__] Vi ste bili izravni messaged strane __user__", + "Offline_DM_Email" : "Vi ste bili izravni messaged strane __user__", "Offline_form" : "offline obrazac", "Offline_form_unavailable_message" : "Offline oblik nedostupan poruku", - "Offline_Mention_Email" : "[__site__] Dobili ste spomenuli __user__ u #__room__", + "Offline_Mention_Email" : "Dobili ste spomenuli __user__ u #__room__", "Offline_message" : "offline poruka", "Offline_success_message" : "Offline Poruka uspjeh", "Offline_unavailable" : "offline nedostupna", diff --git a/packages/rocketchat-lib/i18n/hu.i18n.json b/packages/rocketchat-lib/i18n/hu.i18n.json index a87c7aba1c58..c898cc9f0029 100644 --- a/packages/rocketchat-lib/i18n/hu.i18n.json +++ b/packages/rocketchat-lib/i18n/hu.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-record beszélgetés", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record beszélgetés nem érhető el a böngésző vagy az eszköz.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Te már közvetlen üzenetben által __user__", + "Offline_DM_Email" : "Te már közvetlen üzenetben által __user__", "Offline_form" : "Offline nyomtatvány", "Offline_form_unavailable_message" : "Offline formában érhető el az üzenetet", - "Offline_Mention_Email" : "[__site__] Meg kellett volna említeni a __user__ a #__room__", + "Offline_Mention_Email" : "Meg kellett volna említeni a __user__ a #__room__", "Offline_message" : "Offline üzenet", "Offline_success_message" : "Offline siker üzenet", "Offline_unavailable" : "Offline nem érhető el", diff --git a/packages/rocketchat-lib/i18n/id.i18n.json b/packages/rocketchat-lib/i18n/id.i18n.json index 26493ad5ffaa..cb984e0f1a31 100644 --- a/packages/rocketchat-lib/i18n/id.i18n.json +++ b/packages/rocketchat-lib/i18n/id.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-record Conversation", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record percakapan tidak tersedia untuk browser atau perangkat.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Anda telah langsung mengirim pesan oleh __user__", + "Offline_DM_Email" : "Anda telah langsung mengirim pesan oleh __user__", "Offline_form" : "formulir Offline", "Offline_form_unavailable_message" : "Formulir Offline pesan tidak tersedia", - "Offline_Mention_Email" : "[__site__] Anda telah disebutkan oleh __user__ di #__room__", + "Offline_Mention_Email" : "Anda telah disebutkan oleh __user__ di #__room__", "Offline_message" : "pesan Offline", "Offline_success_message" : "pesan sukses Offline", "Offline_unavailable" : "Offline tidak tersedia", diff --git a/packages/rocketchat-lib/i18n/it.i18n.json b/packages/rocketchat-lib/i18n/it.i18n.json index 8628438aaa15..08db1161a377 100644 --- a/packages/rocketchat-lib/i18n/it.i18n.json +++ b/packages/rocketchat-lib/i18n/it.i18n.json @@ -768,10 +768,10 @@ "Off_the_record_conversation" : "Off-the-record di conversazione", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record di conversazione non è disponibile per il browser o dispositivo.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Sei stato diretto da messaged __user__", + "Offline_DM_Email" : "Sei stato diretto da messaged __user__", "Offline_form" : "modulo collegato", "Offline_form_unavailable_message" : "Messaggio se il modulo di offline non è disponibile", - "Offline_Mention_Email" : "[__site__] Sei stato citato da __user__ in #__room__", + "Offline_Mention_Email" : "Sei stato citato da __user__ in #__room__", "Offline_message" : "messaggio offline", "Offline_success_message" : "Messaggio di successo offline", "Offline_unavailable" : "Offline non disponibile", diff --git a/packages/rocketchat-lib/i18n/ja.i18n.json b/packages/rocketchat-lib/i18n/ja.i18n.json index 6868d20f63f0..21c323a48034 100644 --- a/packages/rocketchat-lib/i18n/ja.i18n.json +++ b/packages/rocketchat-lib/i18n/ja.i18n.json @@ -770,10 +770,10 @@ "Off_the_record_conversation" : "オフレコ会話", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "ご利用のブラウザーやデバイスでは、オフレコ会話を利用できません", "Offline" : "オフライン", - "Offline_DM_Email" : "[__site__] ダイレクトメッセージが届いています by __user__", + "Offline_DM_Email" : "ダイレクトメッセージが届いています by __user__", "Offline_form" : "オフラインフォーム", "Offline_form_unavailable_message" : "オフラインフォーム不可メッセージ", - "Offline_Mention_Email" : "[__site__] あなたについて #__room__ でコメントされています by __user__", + "Offline_Mention_Email" : "あなたについて #__room__ でコメントされています by __user__", "Offline_message" : "オフラインメッセージ", "Offline_success_message" : "オフライン成功メッセージ", "Offline_unavailable" : "オフライン利用できません", diff --git a/packages/rocketchat-lib/i18n/km.i18n.json b/packages/rocketchat-lib/i18n/km.i18n.json index dd3effabcf20..1d997f93da34 100644 --- a/packages/rocketchat-lib/i18n/km.i18n.json +++ b/packages/rocketchat-lib/i18n/km.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "បិទការកត់ត្រាការសន្ទនា", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "បិទការកត់ត្រាការសន្ទនាគឺជាការមិនអាចរកបានសម្រាប់កម្មវិធីរុករកឬឧបករណ៍របស់អ្នក។", "Offline" : "ក្រៅបណ្តាញ", - "Offline_DM_Email" : "[__site__] អ្នកត្រូវបាន messaged ដោយផ្ទាល់ដោយ __user__", + "Offline_DM_Email" : "អ្នកត្រូវបាន messaged ដោយផ្ទាល់ដោយ __user__", "Offline_form" : "សំណុំបែបបទដែលបានក្រៅបណ្តាញ", "Offline_form_unavailable_message" : "សំណុំបែបបទដែលបានក្រៅបណ្តាញសារមិនអាចប្រើបាន", - "Offline_Mention_Email" : "[__site__] អ្នកត្រូវបានលើកឡើងដោយ __user__ ក្នុង #__room__", + "Offline_Mention_Email" : "អ្នកត្រូវបានលើកឡើងដោយ __user__ ក្នុង #__room__", "Offline_message" : "សារក្រៅបណ្តាញ", "Offline_success_message" : "សារដែលទទួលបានជោគជ័យក្រៅបណ្តាញ", "Offline_unavailable" : "មិនអាចប្រើបានក្រៅបណ្តាញ", diff --git a/packages/rocketchat-lib/i18n/ko.i18n.json b/packages/rocketchat-lib/i18n/ko.i18n.json index c6bb7005d556..f254b46f7cc2 100644 --- a/packages/rocketchat-lib/i18n/ko.i18n.json +++ b/packages/rocketchat-lib/i18n/ko.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "오프 - 더 - 레코드 대화", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "오프 - 더 - 레코드 대화는 브라우저 나 장치를 사용할 수 없습니다.", "Offline" : "오프라인", - "Offline_DM_Email" : "[__site__] 당신이 직접 __user__에 의해 메세지되었습니다", + "Offline_DM_Email" : "당신이 직접 __user__에 의해 메세지되었습니다", "Offline_form" : "오프라인 형태", "Offline_form_unavailable_message" : "오프라인 형태로 사용할 수없는 메시지", - "Offline_Mention_Email" : "[__site__] 당신은 #__room__에 __user__ 언급 한", + "Offline_Mention_Email" : "당신은 #__room__에 __user__ 언급 한", "Offline_message" : "오프라인 메시지", "Offline_success_message" : "오프라인 성공 메시지", "Offline_unavailable" : "오프라인으로 사용할 수 없습니다", diff --git a/packages/rocketchat-lib/i18n/ku.i18n.json b/packages/rocketchat-lib/i18n/ku.i18n.json index b43ba9c71c24..bd84a17a4e51 100644 --- a/packages/rocketchat-lib/i18n/ku.i18n.json +++ b/packages/rocketchat-lib/i18n/ku.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-record Conversation", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record hevpeyvînekê de ye ji bo browser an amûrê xwe ne amade ne.", "Offline" : "Ne girêdayî", - "Offline_DM_Email" : "[__site__] Te direct by __user__ messaged dîtin", + "Offline_DM_Email" : "Te direct by __user__ messaged dîtin", "Offline_form" : "forma is offline", "Offline_form_unavailable_message" : "Ne girêdayî form message unavailable", - "Offline_Mention_Email" : "[__site__] Te by __user__ li #__room__ bêşê", + "Offline_Mention_Email" : "Te by __user__ li #__room__ bêşê", "Offline_message" : "peyamek Negirêdayî", "Offline_success_message" : "message serkeftina is offline", "Offline_unavailable" : "Ne girêdayî ne amade ye", diff --git a/packages/rocketchat-lib/i18n/lo.i18n.json b/packages/rocketchat-lib/i18n/lo.i18n.json index 5e24c82ebb17..8a4b36e25500 100644 --- a/packages/rocketchat-lib/i18n/lo.i18n.json +++ b/packages/rocketchat-lib/i18n/lo.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "ໄປໄດ້, ການບັນທຶກການສົນທະນາ", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "ໄປໄດ້, ການບັນທຶກການສົນທະນາແມ່ນບໍ່ສາມາດໃຊ້ສໍາລັບຕົວທ່ອງເວັບຫຼືອຸປະກອນຂອງທ່ານ.", "Offline" : "ອອຟໄລ", - "Offline_DM_Email" : "[__site__] ທ່ານໄດ້ຮັບການ messaged ໂດຍກົງໂດຍ __user__", + "Offline_DM_Email" : "ທ່ານໄດ້ຮັບການ messaged ໂດຍກົງໂດຍ __user__", "Offline_form" : "ຮູບແບບອອຟໄລ", "Offline_form_unavailable_message" : "ຮູບແບບອອຟໄລຂໍ້ຄວາມບໍ່ສາມາດໃຊ້", - "Offline_Mention_Email" : "[__site__] ທ່ານໄດ້ຮັບການທີ່ໄດ້ກ່າວມາໂດຍ __user__ ໃນ #__room__", + "Offline_Mention_Email" : "ທ່ານໄດ້ຮັບການທີ່ໄດ້ກ່າວມາໂດຍ __user__ ໃນ #__room__", "Offline_message" : "ຂໍ້ຄວາມອອຟໄລ", "Offline_success_message" : "ຂໍ້ຄວາມສໍາເລັດອອຟໄລ", "Offline_unavailable" : "ບໍ່ສາມາດໃຊ້ອອຟໄລ", diff --git a/packages/rocketchat-lib/i18n/ms-MY.i18n.json b/packages/rocketchat-lib/i18n/ms-MY.i18n.json index 24057f2162a5..b2e8641ec3eb 100644 --- a/packages/rocketchat-lib/i18n/ms-MY.i18n.json +++ b/packages/rocketchat-lib/i18n/ms-MY.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-rekod Perbualan", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-rekod perbualan tidak tersedia untuk pelayar atau peranti anda.", "Offline" : "offline", - "Offline_DM_Email" : "[__site__] Anda telah menghantar mesej langsung oleh __user__", + "Offline_DM_Email" : "Anda telah menghantar mesej langsung oleh __user__", "Offline_form" : "bentuk offline", "Offline_form_unavailable_message" : "bentuk Offline mesej tersedia", - "Offline_Mention_Email" : "[__site__] Anda telah disebut oleh __user__ dalam #__room__", + "Offline_Mention_Email" : "Anda telah disebut oleh __user__ dalam #__room__", "Offline_message" : "mesej offline", "Offline_success_message" : "mesej kejayaan Offline", "Offline_unavailable" : "luar talian tidak tersedia", diff --git a/packages/rocketchat-lib/i18n/nl.i18n.json b/packages/rocketchat-lib/i18n/nl.i18n.json index e9e74760cabd..9ffe67e01e83 100644 --- a/packages/rocketchat-lib/i18n/nl.i18n.json +++ b/packages/rocketchat-lib/i18n/nl.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-opname Conversation", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-opname gesprek is niet beschikbaar voor uw browser of apparaat.", "Offline" : "offline", - "Offline_DM_Email" : "[__site__] Je hebt direct zijn messaged door __user__", + "Offline_DM_Email" : "Je hebt direct zijn messaged door __user__", "Offline_form" : "offline vorm", "Offline_form_unavailable_message" : "Offline vorm beschikbaar bericht", - "Offline_Mention_Email" : "[__site__] Je bent genoemd door __user__ in #__room__", + "Offline_Mention_Email" : "Je bent genoemd door __user__ in #__room__", "Offline_message" : "offline bericht", "Offline_success_message" : "Offline succes bericht", "Offline_unavailable" : "offline beschikbaar", diff --git a/packages/rocketchat-lib/i18n/pl.i18n.json b/packages/rocketchat-lib/i18n/pl.i18n.json index e108e0d6fe8e..07a1afb9f3c9 100644 --- a/packages/rocketchat-lib/i18n/pl.i18n.json +++ b/packages/rocketchat-lib/i18n/pl.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Konwersacja \"Off-the-record\"", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Konwersacja \"Off-the-record\" nie jest dostępna dla przeglądarki lub urządzenia.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Dostałeś nową wiadomość bezpośrednią od __user__", + "Offline_DM_Email" : "Dostałeś nową wiadomość bezpośrednią od __user__", "Offline_form" : "Formularz nieaktywny", "Offline_form_unavailable_message" : "Formularz niedostępny niedostępny wiadomość", - "Offline_Mention_Email" : "[__site__] Zostałeś wspomniany przez __user__ w #__room__", + "Offline_Mention_Email" : "Zostałeś wspomniany przez __user__ w #__room__", "Offline_message" : "Offline wiadomości", "Offline_success_message" : "Offline wiadomości sukces", "Offline_unavailable" : "Offline niedostępna", diff --git a/packages/rocketchat-lib/i18n/pt.i18n.json b/packages/rocketchat-lib/i18n/pt.i18n.json index 1f71ef9ccb56..4aeb5a077194 100644 --- a/packages/rocketchat-lib/i18n/pt.i18n.json +++ b/packages/rocketchat-lib/i18n/pt.i18n.json @@ -764,10 +764,10 @@ "Off_the_record_conversation" : "Conversa Off-the-record", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Conversa Off-the-record não está disponível para o seu navegador ou dispositivo.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Você recebeu uma mensagem direta de __user__", + "Offline_DM_Email" : "Você recebeu uma mensagem direta de __user__", "Offline_form" : "Formulário offline", "Offline_form_unavailable_message" : "Mensage quando formulário offline indisponível", - "Offline_Mention_Email" : "[__site__] Você foi mencionado por __user__ em #__room__", + "Offline_Mention_Email" : "Você foi mencionado por __user__ em #__room__", "Offline_message" : "Mensagem quando offline", "Offline_success_message" : "Mensagem de sucesso ao enviar formulário offline", "Offline_unavailable" : "Form offline indisponível", diff --git a/packages/rocketchat-lib/i18n/ro.i18n.json b/packages/rocketchat-lib/i18n/ro.i18n.json index e63b81f23794..9a23ee137c0c 100644 --- a/packages/rocketchat-lib/i18n/ro.i18n.json +++ b/packages/rocketchat-lib/i18n/ro.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-record conversație", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record de conversație nu este disponibilă pentru browser-ul sau dispozitivul.", "Offline" : "Deconectat", - "Offline_DM_Email" : "[__site__] Ai fost messaged directe de __user__", + "Offline_DM_Email" : "Ai fost messaged directe de __user__", "Offline_form" : "formularul offline", "Offline_form_unavailable_message" : "Formularul Offline Mesaj indisponibil", - "Offline_Mention_Email" : "[__site__] Ați fost menționat de către __user__ în #__room__", + "Offline_Mention_Email" : "Ați fost menționat de către __user__ în #__room__", "Offline_message" : "mesaj offline", "Offline_success_message" : "Mesajul de succes offline", "Offline_unavailable" : "offline nu sunt disponibile", diff --git a/packages/rocketchat-lib/i18n/ru.i18n.json b/packages/rocketchat-lib/i18n/ru.i18n.json index 18200584370c..c982ffe5f365 100644 --- a/packages/rocketchat-lib/i18n/ru.i18n.json +++ b/packages/rocketchat-lib/i18n/ru.i18n.json @@ -765,10 +765,10 @@ "Off_the_record_conversation" : "Конфиденциальная беседа", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Конфиденциальная беседа недоступна в вашем браузере или на вашем устройстве.", "Offline" : "Не в сети", - "Offline_DM_Email" : "[__site__]  вам было отправлено сообщение пользователем __user__", + "Offline_DM_Email" : " вам было отправлено сообщение пользователем __user__", "Offline_form" : "Офлайн форма", "Offline_form_unavailable_message" : "Офлайн сообщение", - "Offline_Mention_Email" : "[__site__] вас упомянул(а) __user__ в #__room__", + "Offline_Mention_Email" : " вас упомянул(а) __user__ в #__room__", "Offline_message" : "Офлайн сообщение", "Offline_success_message" : "Офлайн сообщение об отправке", "Offline_unavailable" : "Offline недоступен", diff --git a/packages/rocketchat-lib/i18n/sq.i18n.json b/packages/rocketchat-lib/i18n/sq.i18n.json index 8bb1c33dc191..be633448d832 100644 --- a/packages/rocketchat-lib/i18n/sq.i18n.json +++ b/packages/rocketchat-lib/i18n/sq.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-rekord bisedë", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-rekord biseda nuk është në dispozicion për shfletuesit tuaj ose pajisje.", "Offline" : "në linjë", - "Offline_DM_Email" : "[__site__] Ju keni qenë mesazhi direkt nga __user__", + "Offline_DM_Email" : "Ju keni qenë mesazhi direkt nga __user__", "Offline_form" : "Forma Offline", "Offline_form_unavailable_message" : "Forma Offline mesazh padisponueshëm", - "Offline_Mention_Email" : "[__site__] Ju keni përmendur nga __user__ në #__room__", + "Offline_Mention_Email" : "Ju keni përmendur nga __user__ në #__room__", "Offline_message" : "mesazhi në linjë", "Offline_success_message" : "Mesazhi Offline sukses", "Offline_unavailable" : "Offline padisponueshëm", diff --git a/packages/rocketchat-lib/i18n/sr.i18n.json b/packages/rocketchat-lib/i18n/sr.i18n.json index 44b6e861ee1e..9e967dbad89e 100644 --- a/packages/rocketchat-lib/i18n/sr.i18n.json +++ b/packages/rocketchat-lib/i18n/sr.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Офф-тхе-рецорд Разговор", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Офф-тхе-рецорд разговор није доступан за ваш прегледач или уређај.", "Offline" : "оффлине", - "Offline_DM_Email" : "[__site__] Сте били директно поручио је __user__", + "Offline_DM_Email" : "Сте били директно поручио је __user__", "Offline_form" : "оффлине образац", "Offline_form_unavailable_message" : "Оффлине облик недоступан порука", - "Offline_Mention_Email" : "[__site__] Сте је поменуо __user__ у #__room__", + "Offline_Mention_Email" : "Сте је поменуо __user__ у #__room__", "Offline_message" : "оффлине порука", "Offline_success_message" : "Оффлине успех порука", "Offline_unavailable" : "оффлине недоступан", diff --git a/packages/rocketchat-lib/i18n/sv.i18n.json b/packages/rocketchat-lib/i18n/sv.i18n.json index df14be8499a0..333edaf3726e 100644 --- a/packages/rocketchat-lib/i18n/sv.i18n.json +++ b/packages/rocketchat-lib/i18n/sv.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-record konversation", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-the-record konversationen finns inte tillgängligt för din webbläsare eller enhet.", "Offline" : "Off-line", - "Offline_DM_Email" : "[__site__] Du har direkt messaged av __user__", + "Offline_DM_Email" : "Du har direkt messaged av __user__", "Offline_form" : "offline formen", "Offline_form_unavailable_message" : "Offline formen tillgänglig meddelande", - "Offline_Mention_Email" : "[__site__] Du har nämnts av __user__ i #__room__", + "Offline_Mention_Email" : "Du har nämnts av __user__ i #__room__", "Offline_message" : "offline meddelande", "Offline_success_message" : "Offline framgång meddelande", "Offline_unavailable" : "offline tillgänglig", diff --git a/packages/rocketchat-lib/i18n/ta-IN.i18n.json b/packages/rocketchat-lib/i18n/ta-IN.i18n.json index 4455d1695cea..0b5f35896e96 100644 --- a/packages/rocketchat-lib/i18n/ta-IN.i18n.json +++ b/packages/rocketchat-lib/i18n/ta-IN.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "பதிவில் உரையாடல்", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "பதிவில் உரையாடல் உங்களது உலாவி அல்லது சாதனம் கிடைக்கவில்லை.", "Offline" : "ஆஃப்லைன்", - "Offline_DM_Email" : "[__site__] நீங்கள் நேரடி __user__ மூலம் குறுஞ்செய்தி வருகின்றன", + "Offline_DM_Email" : "நீங்கள் நேரடி __user__ மூலம் குறுஞ்செய்தி வருகின்றன", "Offline_form" : "ஆஃப்லைன் வடிவம்", "Offline_form_unavailable_message" : "ஆஃப்லைன் வடிவம் கிடைக்கவில்லை செய்தி", - "Offline_Mention_Email" : "[__site__] நீங்கள் #__room__ உள்ள __user__ குறிப்பிட்டுள்ள", + "Offline_Mention_Email" : "நீங்கள் #__room__ உள்ள __user__ குறிப்பிட்டுள்ள", "Offline_message" : "ஆஃப்லைன் செய்தி", "Offline_success_message" : "ஆஃப்லைன் வெற்றி செய்தியை", "Offline_unavailable" : "ஆஃப்லைனில் கிடையாது", diff --git a/packages/rocketchat-lib/i18n/tr.i18n.json b/packages/rocketchat-lib/i18n/tr.i18n.json index f41be2f4c7a3..008862686fa8 100644 --- a/packages/rocketchat-lib/i18n/tr.i18n.json +++ b/packages/rocketchat-lib/i18n/tr.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-the-record Konuşma", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off-kayıt konuşma tarayıcınız veya aygıt için geçerli değildir.", "Offline" : "Çevrimdışı", - "Offline_DM_Email" : "[__site__] Direkt __user__ tarafından mesajla edilmiştir", + "Offline_DM_Email" : "Direkt __user__ tarafından mesajla edilmiştir", "Offline_form" : "Çevrimdışı formu", "Offline_form_unavailable_message" : "Çevrimdışı formu kullanılamıyor mesajı", - "Offline_Mention_Email" : "[__site__] Sen #__room__ içinde __user__ tarafından söz edilmiştir", + "Offline_Mention_Email" : "Sen #__room__ içinde __user__ tarafından söz edilmiştir", "Offline_message" : "Çevrimdışı mesaj", "Offline_success_message" : "Çevrimdışı başarı mesajı", "Offline_unavailable" : "Çevrimdışı kullanılamıyor", diff --git a/packages/rocketchat-lib/i18n/uk.i18n.json b/packages/rocketchat-lib/i18n/uk.i18n.json index 4e130bd9dcd8..5f3b1e9cd275 100644 --- a/packages/rocketchat-lib/i18n/uk.i18n.json +++ b/packages/rocketchat-lib/i18n/uk.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "Off-записувані Діалог", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "Off самого запису розмови не доступна для вашого браузера або пристрою.", "Offline" : "Offline", - "Offline_DM_Email" : "[__site__] Ви були прямим шляхом __user__ обмінювалися повідомленнями", + "Offline_DM_Email" : "Ви були прямим шляхом __user__ обмінювалися повідомленнями", "Offline_form" : "Offline форма", "Offline_form_unavailable_message" : "Offline форма недоступний повідомлення", - "Offline_Mention_Email" : "[__site__] Ви були згадані __user__ в #__room__", + "Offline_Mention_Email" : "Ви були згадані __user__ в #__room__", "Offline_message" : "Немає повідомлення", "Offline_success_message" : "Немає повідомлення про успішне виконання", "Offline_unavailable" : "Offline недоступний", diff --git a/packages/rocketchat-lib/i18n/zh-TW.i18n.json b/packages/rocketchat-lib/i18n/zh-TW.i18n.json index 6f5aba0dfa3a..fd245a0b9803 100644 --- a/packages/rocketchat-lib/i18n/zh-TW.i18n.json +++ b/packages/rocketchat-lib/i18n/zh-TW.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "現成的通話記錄", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "現成的記錄談話不適用於您的瀏覽器或設備。", "Offline" : "當前離線", - "Offline_DM_Email" : "[__site__]您已通過__user__被直接傳遞消息", + "Offline_DM_Email" : "您已通過__user__被直接傳遞消息", "Offline_form" : "離線表單", "Offline_form_unavailable_message" : "離線形式不可用消息", - "Offline_Mention_Email" : "[__site__]你已經在#__room__ __user__提到", + "Offline_Mention_Email" : "你已經在#__room__ __user__提到", "Offline_message" : "離線消息", "Offline_success_message" : "離線成功消息", "Offline_unavailable" : "離線不可用", diff --git a/packages/rocketchat-lib/i18n/zh.i18n.json b/packages/rocketchat-lib/i18n/zh.i18n.json index e5b66fe8758a..bac0bfe8343d 100644 --- a/packages/rocketchat-lib/i18n/zh.i18n.json +++ b/packages/rocketchat-lib/i18n/zh.i18n.json @@ -762,10 +762,10 @@ "Off_the_record_conversation" : "无记录对话", "Off_the_record_conversation_is_not_available_for_your_browser_or_device" : "您的浏览器或设备不支持无记录对话。", "Offline" : "离线", - "Offline_DM_Email" : "[__site__] __user__ 请求和你直接对话", + "Offline_DM_Email" : "__user__ 请求和你直接对话", "Offline_form" : "离线表单", "Offline_form_unavailable_message" : "离线形式不可用消息", - "Offline_Mention_Email" : "[__site__] 您在 #__room__ 中被 __user__ 提及", + "Offline_Mention_Email" : "您在 #__room__ 中被 __user__ 提及", "Offline_message" : "离线消息", "Offline_success_message" : "离线成功消息", "Offline_unavailable" : "离线不可用", From bb6825421426674a9420bb2f8b83470c30beea11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ro=CC=88hers=20Moura?= Date: Wed, 20 Jul 2016 20:30:56 -0300 Subject: [PATCH 4/6] site_name removed from the email body --- .../server/lib/sendEmailOnMessage.js | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js index 205d7b600da2..d649803bf59d 100644 --- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js +++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js @@ -5,12 +5,12 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { } var emailSubject, usersToSendEmail = {}; + var directMessage = room.t === 'd'; - if (room.t === 'd') { + if (directMessage) { usersToSendEmail[message.rid.replace(message.u._id, '')] = 1; emailSubject = TAPi18n.__('Offline_DM_Email', { - site: RocketChat.settings.get('Site_Name'), user: message.u.username }); @@ -22,18 +22,26 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { } emailSubject = TAPi18n.__('Offline_Mention_Email', { - site: RocketChat.settings.get('Site_Name'), user: message.u.username, room: room.name }); } - var channelRoom = `${process.env.ROOT_URL}channel/${room.name}`; - var linkChannelRoom = `#${room.name}`; - var messageUrl = `${ emailSubject.replace(`#${room.name}`, linkChannelRoom) }`; - var divisorMessage = '
'; + var getMessageLink = () => { + var path, label; + if (directMessage) { + path = `direct/${ room.username }`; + label = room.username; + } else { + path = `channel/${ room.name }`; + label = `#${ room.name }`; + } + var link = `${ label }`; + return `${ emailSubject.replace(label, link) }`; + }; - message.html = messageUrl + divisorMessage + s.escapeHTML(message.msg); + var divisorMessage = '
'; + message.html = getMessageLink() + divisorMessage + s.escapeHTML(message.msg); message = RocketChat.callbacks.run('renderMessage', message); if (message.tokens && message.tokens.length > 0) { @@ -72,6 +80,8 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { var usersOfMention = RocketChat.models.Users.getUsersToSendOfflineEmail(userIdsToSendEmail).fetch(); if (usersOfMention && usersOfMention.length > 0) { + var siteName = RocketChat.settings.get('Site_Name'); + usersOfMention.forEach((user) => { if (user.settings && user.settings.preferences && user.settings.preferences.emailNotificationMode && user.settings.preferences.emailNotificationMode === 'disabled' && usersToSendEmail[user._id] !== 'force') { return; @@ -87,7 +97,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { email = { to: email.address, from: RocketChat.settings.get('From_Email'), - subject: emailSubject, + subject: `[${ siteName }] ${ emailSubject }`, html: '> ' + message.html }; From 17713119a3f3d891346872b67b0e1ed24f11c398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ro=CC=88hers=20Moura?= Date: Mon, 25 Jul 2016 11:48:46 -0300 Subject: [PATCH 5/6] added button go to message --- .../server/lib/sendEmailOnMessage.js | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js index d649803bf59d..073ad8d4534f 100644 --- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js +++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js @@ -28,20 +28,23 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { } var getMessageLink = () => { - var path, label; - if (directMessage) { - path = `direct/${ room.username }`; - label = room.username; - } else { - path = `channel/${ room.name }`; - label = `#${ room.name }`; - } - var link = `${ label }`; - return `${ emailSubject.replace(label, link) }`; + var path = directMessage ? `direct/${ room.username }` : `channel/${ room.name }`; + var style = [ + 'color: #fff;', + 'padding: .5em;', + 'background-color: #04436a;', + 'display: block;', + 'width: 10em;', + 'text-align: center;', + 'text-decoration: none;', + 'margin: auto;', + 'margin-bottom: 8px;' + ].join(' '); + return `GO TO MESSAGE`; }; var divisorMessage = '
'; - message.html = getMessageLink() + divisorMessage + s.escapeHTML(message.msg); + message.html = s.escapeHTML(message.msg) + divisorMessage + getMessageLink(); message = RocketChat.callbacks.run('renderMessage', message); if (message.tokens && message.tokens.length > 0) { @@ -98,7 +101,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { to: email.address, from: RocketChat.settings.get('From_Email'), subject: `[${ siteName }] ${ emailSubject }`, - html: '> ' + message.html + html: message.html }; Email.send(email); From f1e1f682987f7e91817fced4b866f4dc0c7ceee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ro=CC=88hers=20Moura?= Date: Tue, 2 Aug 2016 21:30:32 -0300 Subject: [PATCH 6/6] added message link in en.i18n --- packages/rocketchat-lib/i18n/en.i18n.json | 1 + packages/rocketchat-lib/server/lib/sendEmailOnMessage.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/i18n/en.i18n.json b/packages/rocketchat-lib/i18n/en.i18n.json index d872588478f3..cb3dbd02e5c1 100644 --- a/packages/rocketchat-lib/i18n/en.i18n.json +++ b/packages/rocketchat-lib/i18n/en.i18n.json @@ -798,6 +798,7 @@ "Offline_message" : "Offline message", "Offline_success_message" : "Offline success message", "Offline_unavailable" : "Offline unavailable", + "Offline_Link_Message" : "GO TO MESSAGE", "Online" : "Online", "Only_you_can_see_this_message" : "Only you can see this message", "Oops!" : "Oops", diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js index 073ad8d4534f..91ca179673de 100644 --- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js +++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js @@ -40,7 +40,8 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { 'margin: auto;', 'margin-bottom: 8px;' ].join(' '); - return `GO TO MESSAGE`; + var message = TAPi18n.__('Offline_Link_Message'); + return `${ message }`; }; var divisorMessage = '
';