From b36ec5fd0139cfc8decffd40aec8dfab7ffae4e2 Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Wed, 11 Mar 2015 10:53:39 +0200
Subject: [PATCH] Moves supported browser list from the email message to the JS

---
 index.html                     | 2 +-
 lang/main.json                 | 3 ++-
 libs/app.bundle.js             | 4 +++-
 modules/UI/toolbars/Toolbar.js | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 06ae42ac33..a98a477b2c 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=33"></script>
+    <script src="libs/app.bundle.js?v=34"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=6"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">
diff --git a/lang/main.json b/lang/main.json
index 6facb338c1..57e559297a 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -193,6 +193,7 @@
     {
         "sharedKey": "This conference is password protected. Please use the following pin when joining:\n\n __sharedKey__ \n\n",
         "subject": "Invitation to a __appName__ (__conferenceName__)",
-        "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!"
+        "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!",
+        "and": "and"
     }
 }
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index b8e1f36b95..d950bff3ad 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -4835,12 +4835,14 @@ function inviteParticipants() {
         sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
     }
 
+    var supportedBrowsers = "Chromium, Google Chrome " +
+        APP.translation.translateString("email.and") + " Opera";
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
     var subject = APP.translation.translateString("email.subject",
         {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
     var body = APP.translation.translateString("email.body",
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
-            roomUrl: roomUrl});
+            roomUrl: roomUrl, supportedBrowsers: supportedBrowsers});
     body = body.replace(/\n/g, "%0D%0A");
 
     if (window.localStorage.displayname) {
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index c10e2a29c5..9883b92228 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -202,12 +202,14 @@ function inviteParticipants() {
         sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
     }
 
+    var supportedBrowsers = "Chromium, Google Chrome " +
+        APP.translation.translateString("email.and") + " Opera";
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
     var subject = APP.translation.translateString("email.subject",
         {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
     var body = APP.translation.translateString("email.body",
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
-            roomUrl: roomUrl});
+            roomUrl: roomUrl, supportedBrowsers: supportedBrowsers});
     body = body.replace(/\n/g, "%0D%0A");
 
     if (window.localStorage.displayname) {