Browse Source

Merge pull request #1459 from jitsi/move_p2p

fix: P2P address indication
master
Дамян Минков 8 years ago
parent
commit
0d7cb63978
2 changed files with 10 additions and 9 deletions
  1. 1
    1
      lang/main.json
  2. 9
    8
      modules/UI/videolayout/ConnectionIndicator.js

+ 1
- 1
lang/main.json View File

196
         "transport_plural": "Transports:",
196
         "transport_plural": "Transports:",
197
         "bandwidth": "Estimated bandwidth:",
197
         "bandwidth": "Estimated bandwidth:",
198
         "na": "Come back here for connection information once the conference starts",
198
         "na": "Come back here for connection information once the conference starts",
199
-        "direct": " (direct)"
199
+        "peer_to_peer": " (p2p)"
200
     },
200
     },
201
     "notify": {
201
     "notify": {
202
         "disconnected": "disconnected",
202
         "disconnected": "disconnected",

+ 9
- 8
modules/UI/videolayout/ConnectionIndicator.js View File

215
                 remote_address_key + "' data-i18n-options='" +
215
                 remote_address_key + "' data-i18n-options='" +
216
                     JSON.stringify({count: data.remoteIP.length})
216
                     JSON.stringify({count: data.remoteIP.length})
217
                         + "'></span></td><td> " +
217
                         + "'></span></td><td> " +
218
-                ConnectionIndicator.getStringFromArray(data.remoteIP) +
219
-                "</td></tr>";
218
+                ConnectionIndicator.getStringFromArray(data.remoteIP);
219
+
220
+            // Append (p2p) to indicate the P2P type of transport
221
+            if (isP2P) {
222
+                transport
223
+                    += "<span data-i18n='connectionindicator.peer_to_peer'>";
224
+            }
225
+            transport += "</td></tr>";
220
 
226
 
221
             var key_remote = "connectionindicator.remoteport",
227
             var key_remote = "connectionindicator.remoteport",
222
                 key_local = "connectionindicator.localport";
228
                 key_local = "connectionindicator.localport";
247
                 + "'></span></td>" +
253
                 + "'></span></td>" +
248
                 "<td>"
254
                 "<td>"
249
                     + ConnectionIndicator.getStringFromArray(data.transportType);
255
                     + ConnectionIndicator.getStringFromArray(data.transportType);
250
-            // Append (direct) to indicate the P2P type of transport
251
-            if (isP2P) {
252
-                transport += "<span data-i18n='connectionindicator.direct'>";
253
-            }
254
-            // Close "type" column and end table row
255
-            transport += "</td></tr>";
256
+                + "</td></tr>";
256
 
257
 
257
         }
258
         }
258
 
259
 

Loading…
Cancel
Save