haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaces %0D%0A with \n in the email template text.

This commit is contained in:
hristoterezov 2015-03-11 10:29:21 +02:00
parent 957cc6afc1
commit ae535fcb7d
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=32"></script> <script src="libs/app.bundle.js?v=33"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=6"/> <link rel="stylesheet" href="css/font.css?v=6"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

4
lang/main.json
View File

@ -191,8 +191,8 @@
}, },
"email": "email":
{ {
"sharedKey": "This conference is password protected. Please use the following pin when joining:%0D%0A%0D%0A __sharedKey__ %0D%0A%0D%0A", "sharedKey": "This conference is password protected. Please use the following pin when joining:\n\n __sharedKey__ \n\n",
"subject": "Invitation to a __appName__ (__conferenceName__)", "subject": "Invitation to a __appName__ (__conferenceName__)",
"body": "Hey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.%0D%0A%0D%0APlease click on the following link in order to join the conference.%0D%0A%0D%0A __roomUrl__%0D%0A%0D%0A__sharedKeyText__ Note that __appName__ is currently only supported by Chromium, Google Chrome and Opera, so you need to be using one of these browsers.%0D%0A%0D%0ATalk to you in a sec!" "body": "Hey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.\n\nPlease click on the following link in order to join the conference.\n\n __roomUrl__\n\n__sharedKeyText__ Note that __appName__ is currently only supported by Chromium, Google Chrome and Opera, so you need to be using one of these browsers.\n\nTalk to you in a sec!"
} }
} }

2
libs/app.bundle.js
View File

@ -4832,6 +4832,7 @@ function inviteParticipants() {
sharedKeyText = sharedKeyText =
APP.translation.translateString("email.sharedKey", APP.translation.translateString("email.sharedKey",
{sharedKey: sharedKey}); {sharedKey: sharedKey});
sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
} }
var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1); var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
@ -4840,6 +4841,7 @@ function inviteParticipants() {
var body = APP.translation.translateString("email.body", var body = APP.translation.translateString("email.body",
{appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText, {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
roomUrl: roomUrl}); roomUrl: roomUrl});
body = body.replace(/\n/g, "%0D%0A");
if (window.localStorage.displayname) { if (window.localStorage.displayname) {
body += "%0D%0A%0D%0A" + window.localStorage.displayname; body += "%0D%0A%0D%0A" + window.localStorage.displayname;

2
modules/UI/toolbars/Toolbar.js
View File

@ -199,6 +199,7 @@ function inviteParticipants() {
sharedKeyText = sharedKeyText =
APP.translation.translateString("email.sharedKey", APP.translation.translateString("email.sharedKey",
{sharedKey: sharedKey}); {sharedKey: sharedKey});
sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
} }
var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1); var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
@ -207,6 +208,7 @@ function inviteParticipants() {
var body = APP.translation.translateString("email.body", var body = APP.translation.translateString("email.body",
{appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText, {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
roomUrl: roomUrl}); roomUrl: roomUrl});
body = body.replace(/\n/g, "%0D%0A");
if (window.localStorage.displayname) { if (window.localStorage.displayname) {
body += "%0D%0A%0D%0A" + window.localStorage.displayname; body += "%0D%0A%0D%0A" + window.localStorage.displayname;