Merge branch 'translation'
This commit is contained in:
commit
f79651f806
|
@ -95,14 +95,14 @@
|
||||||
"less": "Show less",
|
"less": "Show less",
|
||||||
"more": "Show more",
|
"more": "Show more",
|
||||||
"address": "Address:",
|
"address": "Address:",
|
||||||
"remoteports": "Remote ports:",
|
"remoteport_plural": "Remote ports:",
|
||||||
"localports": "Local ports:",
|
"localport_plural": "Local ports:",
|
||||||
"remoteport": "Remote port:",
|
"remoteport": "Remote port:",
|
||||||
"localport": "Local port:",
|
"localport": "Local port:",
|
||||||
"localaddress": "Local address: ",
|
"localaddress": "Local address: ",
|
||||||
"localaddresses": "Local addresses: ",
|
"localaddress_plural": "Local addresses: ",
|
||||||
"remoteaddress": "Remote address: ",
|
"remoteaddress": "Remote address: ",
|
||||||
"remoteaddresses": "Remote addresses: ",
|
"remoteaddress_plural": "Remote addresses: ",
|
||||||
"transport": "Transport: ",
|
"transport": "Transport: ",
|
||||||
"bandwidth": "Estimated bandwidth:",
|
"bandwidth": "Estimated bandwidth:",
|
||||||
"na": "Come back here for connection information once the conference starts"
|
"na": "Come back here for connection information once the conference starts"
|
||||||
|
|
|
@ -6039,47 +6039,43 @@ ConnectionIndicator.prototype.generateText = function () {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var local_address_key = "connectionindicator." +
|
var local_address_key = "connectionindicator.localaddress";
|
||||||
(data.localIP.length > 1? "localaddresses" : "localaddress");
|
var remote_address_key = "connectionindicator.remoteaddress";
|
||||||
var remote_address_key = "connectionindicator." +
|
|
||||||
(data.remoteIP.length > 1? "remoteaddresses" : "remoteaddress");
|
|
||||||
var localTransport =
|
var localTransport =
|
||||||
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
||||||
local_address_key +"'>" +
|
local_address_key +"' data-i18n-options='" +
|
||||||
translate(local_address_key) + "</span></td><td> " +
|
JSON.stringify({count: data.localIP.length}) + "'>" +
|
||||||
|
translate(local_address_key, {count: data.localIP.length}) +
|
||||||
|
"</span></td><td> " +
|
||||||
ConnectionIndicator.getStringFromArray(data.localIP) +
|
ConnectionIndicator.getStringFromArray(data.localIP) +
|
||||||
"</td></tr>";
|
"</td></tr>";
|
||||||
transport =
|
transport =
|
||||||
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
||||||
remote_address_key + "'>" +
|
remote_address_key + "' data-i18n-options='" +
|
||||||
translate(remote_address_key) + "</span></td><td> " +
|
JSON.stringify({count: data.remoteIP.length}) + "'>" +
|
||||||
|
translate(remote_address_key,
|
||||||
|
{count: data.remoteIP.length}) +
|
||||||
|
"</span></td><td> " +
|
||||||
ConnectionIndicator.getStringFromArray(data.remoteIP) +
|
ConnectionIndicator.getStringFromArray(data.remoteIP) +
|
||||||
"</td></tr>";
|
"</td></tr>";
|
||||||
|
|
||||||
var key_remote = "connectionindicator.",
|
var key_remote = "connectionindicator.remoteport",
|
||||||
key_local = "connectionindicator.";
|
key_local = "connectionindicator.localport";
|
||||||
|
|
||||||
if(this.transport.length > 1)
|
|
||||||
{
|
|
||||||
key_remote += "remoteports";
|
|
||||||
key_local += "localports";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
key_remote += "remoteport";
|
|
||||||
key_local += "localport";
|
|
||||||
}
|
|
||||||
|
|
||||||
transport += "<tr>" +
|
transport += "<tr>" +
|
||||||
"<td>" +
|
"<td>" +
|
||||||
"<span class='jitsipopover_blue' data-i18n='" + key_remote +
|
"<span class='jitsipopover_blue' data-i18n='" + key_remote +
|
||||||
"'>" +
|
"' data-i18n-options='" +
|
||||||
translate(key_remote) + "</span></td><td>";
|
JSON.stringify({count: this.transport.length}) + "'>" +
|
||||||
|
translate(key_remote, {count: this.transport.length}) +
|
||||||
|
"</span></td><td>";
|
||||||
localTransport += "<tr>" +
|
localTransport += "<tr>" +
|
||||||
"<td>" +
|
"<td>" +
|
||||||
"<span class='jitsipopover_blue' data-i18n='" + key_local +
|
"<span class='jitsipopover_blue' data-i18n='" + key_local +
|
||||||
"'>" +
|
"' data-i18n-options='" +
|
||||||
translate(key_local) + "</span></td><td>";
|
JSON.stringify({count: this.transport.length}) + "'>" +
|
||||||
|
translate(key_local, {count: this.transport.length}) +
|
||||||
|
"</span></td><td>";
|
||||||
|
|
||||||
transport +=
|
transport +=
|
||||||
ConnectionIndicator.getStringFromArray(data.remotePort);
|
ConnectionIndicator.getStringFromArray(data.remotePort);
|
||||||
|
@ -11643,6 +11639,7 @@ var defaultOptions = {
|
||||||
defaultValueFromContent: false,
|
defaultValueFromContent: false,
|
||||||
app: interfaceConfig.APP_NAME,
|
app: interfaceConfig.APP_NAME,
|
||||||
getAsync: false,
|
getAsync: false,
|
||||||
|
defaultValueFromContent: false,
|
||||||
customLoad: function(lng, ns, options, done) {
|
customLoad: function(lng, ns, options, done) {
|
||||||
var resPath = "lang/__ns__-__lng__.json";
|
var resPath = "lang/__ns__-__lng__.json";
|
||||||
if(lng === languages.EN)
|
if(lng === languages.EN)
|
||||||
|
|
|
@ -229,47 +229,43 @@ ConnectionIndicator.prototype.generateText = function () {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var local_address_key = "connectionindicator." +
|
var local_address_key = "connectionindicator.localaddress";
|
||||||
(data.localIP.length > 1? "localaddresses" : "localaddress");
|
var remote_address_key = "connectionindicator.remoteaddress";
|
||||||
var remote_address_key = "connectionindicator." +
|
|
||||||
(data.remoteIP.length > 1? "remoteaddresses" : "remoteaddress");
|
|
||||||
var localTransport =
|
var localTransport =
|
||||||
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
||||||
local_address_key +"'>" +
|
local_address_key +"' data-i18n-options='" +
|
||||||
translate(local_address_key) + "</span></td><td> " +
|
JSON.stringify({count: data.localIP.length}) + "'>" +
|
||||||
|
translate(local_address_key, {count: data.localIP.length}) +
|
||||||
|
"</span></td><td> " +
|
||||||
ConnectionIndicator.getStringFromArray(data.localIP) +
|
ConnectionIndicator.getStringFromArray(data.localIP) +
|
||||||
"</td></tr>";
|
"</td></tr>";
|
||||||
transport =
|
transport =
|
||||||
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
|
||||||
remote_address_key + "'>" +
|
remote_address_key + "' data-i18n-options='" +
|
||||||
translate(remote_address_key) + "</span></td><td> " +
|
JSON.stringify({count: data.remoteIP.length}) + "'>" +
|
||||||
|
translate(remote_address_key,
|
||||||
|
{count: data.remoteIP.length}) +
|
||||||
|
"</span></td><td> " +
|
||||||
ConnectionIndicator.getStringFromArray(data.remoteIP) +
|
ConnectionIndicator.getStringFromArray(data.remoteIP) +
|
||||||
"</td></tr>";
|
"</td></tr>";
|
||||||
|
|
||||||
var key_remote = "connectionindicator.",
|
var key_remote = "connectionindicator.remoteport",
|
||||||
key_local = "connectionindicator.";
|
key_local = "connectionindicator.localport";
|
||||||
|
|
||||||
if(this.transport.length > 1)
|
|
||||||
{
|
|
||||||
key_remote += "remoteports";
|
|
||||||
key_local += "localports";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
key_remote += "remoteport";
|
|
||||||
key_local += "localport";
|
|
||||||
}
|
|
||||||
|
|
||||||
transport += "<tr>" +
|
transport += "<tr>" +
|
||||||
"<td>" +
|
"<td>" +
|
||||||
"<span class='jitsipopover_blue' data-i18n='" + key_remote +
|
"<span class='jitsipopover_blue' data-i18n='" + key_remote +
|
||||||
"'>" +
|
"' data-i18n-options='" +
|
||||||
translate(key_remote) + "</span></td><td>";
|
JSON.stringify({count: this.transport.length}) + "'>" +
|
||||||
|
translate(key_remote, {count: this.transport.length}) +
|
||||||
|
"</span></td><td>";
|
||||||
localTransport += "<tr>" +
|
localTransport += "<tr>" +
|
||||||
"<td>" +
|
"<td>" +
|
||||||
"<span class='jitsipopover_blue' data-i18n='" + key_local +
|
"<span class='jitsipopover_blue' data-i18n='" + key_local +
|
||||||
"'>" +
|
"' data-i18n-options='" +
|
||||||
translate(key_local) + "</span></td><td>";
|
JSON.stringify({count: this.transport.length}) + "'>" +
|
||||||
|
translate(key_local, {count: this.transport.length}) +
|
||||||
|
"</span></td><td>";
|
||||||
|
|
||||||
transport +=
|
transport +=
|
||||||
ConnectionIndicator.getStringFromArray(data.remotePort);
|
ConnectionIndicator.getStringFromArray(data.remotePort);
|
||||||
|
|
|
@ -26,6 +26,7 @@ var defaultOptions = {
|
||||||
defaultValueFromContent: false,
|
defaultValueFromContent: false,
|
||||||
app: interfaceConfig.APP_NAME,
|
app: interfaceConfig.APP_NAME,
|
||||||
getAsync: false,
|
getAsync: false,
|
||||||
|
defaultValueFromContent: false,
|
||||||
customLoad: function(lng, ns, options, done) {
|
customLoad: function(lng, ns, options, done) {
|
||||||
var resPath = "lang/__ns__-__lng__.json";
|
var resPath = "lang/__ns__-__lng__.json";
|
||||||
if(lng === languages.EN)
|
if(lng === languages.EN)
|
||||||
|
|
Loading…
Reference in New Issue