From 8a4c341512687f809a5a009e759cbe590530841d Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Fri, 29 May 2015 17:09:44 +0300
Subject: [PATCH] Implements default language config property and comments to
 config.js

---
 config.js                          | 3 +++
 index.html                         | 4 ++--
 libs/app.bundle.js                 | 5 +++++
 modules/translation/translation.js | 5 +++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/config.js b/config.js
index c7b0bc9d5..1152fe881 100644
--- a/config.js
+++ b/config.js
@@ -32,6 +32,9 @@ var config = {
     enableWelcomePage: true,
     enableSimulcast: false, // blocks FF support
     logStats: false, // Enable logging of PeerConnection stats via the focus
+//    startAudioMuted: 10, //every participant after the Nth will start audio muted
+//    startVideoMuted: 10, //every participant after the Nth will start video muted
+//    defaultLanguage: "en",
     /*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
     'During that time service will not be available. ' +
     'Apologise for inconvenience.'*/
diff --git a/index.html b/index.html
index cb1b11e5b..1058b101a 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
     <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
     <meta itemprop="image" content="/images/jitsilogo.png"/>
     <script src="libs/jquery-2.1.1.min.js"></script>
-    <script src="config.js?v=8"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
+    <script src="config.js?v=9"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
     <script src="libs/strophe/strophe.min.js?v=1"></script>
     <script src="libs/strophe/strophe.disco.min.js?v=1"></script>
     <script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>
@@ -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=78"></script>
+    <script src="libs/app.bundle.js?v=79"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=7"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index 112d0f85d..3c899d830 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -12724,6 +12724,11 @@ module.exports = {
                 var settings = Settings.getSettings();
                 if(settings)
                     lang = settings.language;
+
+                if(!lang && config.defaultLanguage)
+                {
+                    lang = config.defaultLanguage;
+                }
             }
         }
 
diff --git a/modules/translation/translation.js b/modules/translation/translation.js
index 25bbcd53d..ecf3864db 100644
--- a/modules/translation/translation.js
+++ b/modules/translation/translation.js
@@ -94,6 +94,11 @@ module.exports = {
                 var settings = Settings.getSettings();
                 if(settings)
                     lang = settings.language;
+
+                if(!lang && config.defaultLanguage)
+                {
+                    lang = config.defaultLanguage;
+                }
             }
         }