Browse Source

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

master
hristoterezov 10 years ago
parent
commit
ae535fcb7d
4 changed files with 7 additions and 3 deletions
  1. 1
    1
      index.html
  2. 2
    2
      lang/main.json
  3. 2
    0
      libs/app.bundle.js
  4. 2
    0
      modules/UI/toolbars/Toolbar.js

+ 1
- 1
index.html View File

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

+ 2
- 2
lang/main.json View File

191
     },
191
     },
192
     "email":
192
     "email":
193
     {
193
     {
194
-        "sharedKey": "This conference is password protected. Please use the following pin when joining:%0D%0A%0D%0A __sharedKey__ %0D%0A%0D%0A",
194
+        "sharedKey": "This conference is password protected. Please use the following pin when joining:\n\n __sharedKey__ \n\n",
195
         "subject": "Invitation to a __appName__ (__conferenceName__)",
195
         "subject": "Invitation to a __appName__ (__conferenceName__)",
196
-        "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!"
196
+        "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!"
197
     }
197
     }
198
 }
198
 }

+ 2
- 0
libs/app.bundle.js View File

4832
         sharedKeyText =
4832
         sharedKeyText =
4833
             APP.translation.translateString("email.sharedKey",
4833
             APP.translation.translateString("email.sharedKey",
4834
                 {sharedKey: sharedKey});
4834
                 {sharedKey: sharedKey});
4835
+        sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
4835
     }
4836
     }
4836
 
4837
 
4837
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
4838
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
4840
     var body = APP.translation.translateString("email.body",
4841
     var body = APP.translation.translateString("email.body",
4841
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
4842
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
4842
             roomUrl: roomUrl});
4843
             roomUrl: roomUrl});
4844
+    body = body.replace(/\n/g, "%0D%0A");
4843
 
4845
 
4844
     if (window.localStorage.displayname) {
4846
     if (window.localStorage.displayname) {
4845
         body += "%0D%0A%0D%0A" + window.localStorage.displayname;
4847
         body += "%0D%0A%0D%0A" + window.localStorage.displayname;

+ 2
- 0
modules/UI/toolbars/Toolbar.js View File

199
         sharedKeyText =
199
         sharedKeyText =
200
             APP.translation.translateString("email.sharedKey",
200
             APP.translation.translateString("email.sharedKey",
201
                 {sharedKey: sharedKey});
201
                 {sharedKey: sharedKey});
202
+        sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
202
     }
203
     }
203
 
204
 
204
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
205
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
207
     var body = APP.translation.translateString("email.body",
208
     var body = APP.translation.translateString("email.body",
208
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
209
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
209
             roomUrl: roomUrl});
210
             roomUrl: roomUrl});
211
+    body = body.replace(/\n/g, "%0D%0A");
210
 
212
 
211
     if (window.localStorage.displayname) {
213
     if (window.localStorage.displayname) {
212
         body += "%0D%0A%0D%0A" + window.localStorage.displayname;
214
         body += "%0D%0A%0D%0A" + window.localStorage.displayname;

Loading…
Cancel
Save