Browse Source

Moves supported browser list from the email message to the JS

master
hristoterezov 10 years ago
parent
commit
b36ec5fd01
4 changed files with 9 additions and 4 deletions
  1. 1
    1
      index.html
  2. 2
    1
      lang/main.json
  3. 3
    1
      libs/app.bundle.js
  4. 3
    1
      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=33"></script>
22
+    <script src="libs/app.bundle.js?v=34"></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
- 1
lang/main.json View File

193
     {
193
     {
194
         "sharedKey": "This conference is password protected. Please use the following pin when joining:\n\n __sharedKey__ \n\n",
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.\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!"
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 __supportedBrowsers__, so you need to be using one of these browsers.\n\nTalk to you in a sec!",
197
+        "and": "and"
197
     }
198
     }
198
 }
199
 }

+ 3
- 1
libs/app.bundle.js View File

4835
         sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
4835
         sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
4836
     }
4836
     }
4837
 
4837
 
4838
+    var supportedBrowsers = "Chromium, Google Chrome " +
4839
+        APP.translation.translateString("email.and") + " Opera";
4838
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
4840
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
4839
     var subject = APP.translation.translateString("email.subject",
4841
     var subject = APP.translation.translateString("email.subject",
4840
         {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
4842
         {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
4841
     var body = APP.translation.translateString("email.body",
4843
     var body = APP.translation.translateString("email.body",
4842
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
4844
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
4843
-            roomUrl: roomUrl});
4845
+            roomUrl: roomUrl, supportedBrowsers: supportedBrowsers});
4844
     body = body.replace(/\n/g, "%0D%0A");
4846
     body = body.replace(/\n/g, "%0D%0A");
4845
 
4847
 
4846
     if (window.localStorage.displayname) {
4848
     if (window.localStorage.displayname) {

+ 3
- 1
modules/UI/toolbars/Toolbar.js View File

202
         sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
202
         sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
203
     }
203
     }
204
 
204
 
205
+    var supportedBrowsers = "Chromium, Google Chrome " +
206
+        APP.translation.translateString("email.and") + " Opera";
205
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
207
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
206
     var subject = APP.translation.translateString("email.subject",
208
     var subject = APP.translation.translateString("email.subject",
207
         {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
209
         {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
208
     var body = APP.translation.translateString("email.body",
210
     var body = APP.translation.translateString("email.body",
209
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
211
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
210
-            roomUrl: roomUrl});
212
+            roomUrl: roomUrl, supportedBrowsers: supportedBrowsers});
211
     body = body.replace(/\n/g, "%0D%0A");
213
     body = body.replace(/\n/g, "%0D%0A");
212
 
214
 
213
     if (window.localStorage.displayname) {
215
     if (window.localStorage.displayname) {

Loading…
Cancel
Save