Przeglądaj źródła

Implements default language config property and comments to config.js

j8
hristoterezov 10 lat temu
rodzic
commit
8a4c341512
4 zmienionych plików z 15 dodań i 2 usunięć
  1. 3
    0
      config.js
  2. 2
    2
      index.html
  3. 5
    0
      libs/app.bundle.js
  4. 5
    0
      modules/translation/translation.js

+ 3
- 0
config.js Wyświetl plik

32
     enableWelcomePage: true,
32
     enableWelcomePage: true,
33
     enableSimulcast: false, // blocks FF support
33
     enableSimulcast: false, // blocks FF support
34
     logStats: false, // Enable logging of PeerConnection stats via the focus
34
     logStats: false, // Enable logging of PeerConnection stats via the focus
35
+//    startAudioMuted: 10, //every participant after the Nth will start audio muted
36
+//    startVideoMuted: 10, //every participant after the Nth will start video muted
37
+//    defaultLanguage: "en",
35
     /*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
38
     /*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
36
     'During that time service will not be available. ' +
39
     'During that time service will not be available. ' +
37
     'Apologise for inconvenience.'*/
40
     'Apologise for inconvenience.'*/

+ 2
- 2
index.html Wyświetl plik

10
     <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
10
     <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
11
     <meta itemprop="image" content="/images/jitsilogo.png"/>
11
     <meta itemprop="image" content="/images/jitsilogo.png"/>
12
     <script src="libs/jquery-2.1.1.min.js"></script>
12
     <script src="libs/jquery-2.1.1.min.js"></script>
13
-    <script src="config.js?v=8"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
13
+    <script src="config.js?v=9"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
14
     <script src="libs/strophe/strophe.min.js?v=1"></script>
14
     <script src="libs/strophe/strophe.min.js?v=1"></script>
15
     <script src="libs/strophe/strophe.disco.min.js?v=1"></script>
15
     <script src="libs/strophe/strophe.disco.min.js?v=1"></script>
16
     <script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>
16
     <script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>
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=78"></script>
22
+    <script src="libs/app.bundle.js?v=79"></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=7"/>
24
     <link rel="stylesheet" href="css/font.css?v=7"/>
25
     <link rel="stylesheet" href="css/toastr.css?v=1">
25
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 5
- 0
libs/app.bundle.js Wyświetl plik

12724
                 var settings = Settings.getSettings();
12724
                 var settings = Settings.getSettings();
12725
                 if(settings)
12725
                 if(settings)
12726
                     lang = settings.language;
12726
                     lang = settings.language;
12727
+
12728
+                if(!lang && config.defaultLanguage)
12729
+                {
12730
+                    lang = config.defaultLanguage;
12731
+                }
12727
             }
12732
             }
12728
         }
12733
         }
12729
 
12734
 

+ 5
- 0
modules/translation/translation.js Wyświetl plik

94
                 var settings = Settings.getSettings();
94
                 var settings = Settings.getSettings();
95
                 if(settings)
95
                 if(settings)
96
                     lang = settings.language;
96
                     lang = settings.language;
97
+
98
+                if(!lang && config.defaultLanguage)
99
+                {
100
+                    lang = config.defaultLanguage;
101
+                }
97
             }
102
             }
98
         }
103
         }
99
 
104
 

Ładowanie…
Anuluj
Zapisz