haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'translation'

This commit is contained in:
hristoterezov 2015-03-04 11:06:02 +02:00
parent 6048d0a325 6f12446c99
commit f79651f806
4 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/main.json
View File

@ -95,14 +95,14 @@
"less": "Show less",
"more": "Show more",
"address": "Address:",
"remoteports": "Remote ports:",
"localports": "Local ports:",
"remoteport_plural": "Remote ports:",
"localport_plural": "Local ports:",
"remoteport": "Remote port:",
"localport": "Local port:",
"localaddress": "Local address: ",
"localaddresses": "Local addresses: ",
"localaddress_plural": "Local addresses: ",
"remoteaddress": "Remote address: ",
"remoteaddresses": "Remote addresses: ",
"remoteaddress_plural": "Remote addresses: ",
"transport": "Transport: ",
"bandwidth": "Estimated bandwidth:",
"na": "Come back here for connection information once the conference starts"

47
libs/app.bundle.js
View File

@ -6039,47 +6039,43 @@ ConnectionIndicator.prototype.generateText = function () {
}
var local_address_key = "connectionindicator." +
(data.localIP.length > 1? "localaddresses" : "localaddress");
var remote_address_key = "connectionindicator." +
(data.remoteIP.length > 1? "remoteaddresses" : "remoteaddress");
var local_address_key = "connectionindicator.localaddress";
var remote_address_key = "connectionindicator.remoteaddress";
var localTransport =
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
local_address_key +"'>" +
translate(local_address_key) + "</span></td><td> " +
local_address_key +"' data-i18n-options='" +
JSON.stringify({count: data.localIP.length}) + "'>" +
translate(local_address_key, {count: data.localIP.length}) +
"</span></td><td> " +
ConnectionIndicator.getStringFromArray(data.localIP) +
"</td></tr>";
transport =
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
remote_address_key + "'>" +
translate(remote_address_key) + "</span></td><td> " +
remote_address_key + "' data-i18n-options='" +
JSON.stringify({count: data.remoteIP.length}) + "'>" +
translate(remote_address_key,
{count: data.remoteIP.length}) +
"</span></td><td> " +
ConnectionIndicator.getStringFromArray(data.remoteIP) +
"</td></tr>";
var key_remote = "connectionindicator.",
key_local = "connectionindicator.";
if(this.transport.length > 1)
{
key_remote += "remoteports";
key_local += "localports";
}
else
{
key_remote += "remoteport";
key_local += "localport";
}
var key_remote = "connectionindicator.remoteport",
key_local = "connectionindicator.localport";
transport += "<tr>" +
"<td>" +
"<span class='jitsipopover_blue' data-i18n='" + key_remote +
"'>" +
translate(key_remote) + "</span></td><td>";
"' data-i18n-options='" +
JSON.stringify({count: this.transport.length}) + "'>" +
translate(key_remote, {count: this.transport.length}) +
"</span></td><td>";
localTransport += "<tr>" +
"<td>" +
"<span class='jitsipopover_blue' data-i18n='" + key_local +
"'>" +
translate(key_local) + "</span></td><td>";
"' data-i18n-options='" +
JSON.stringify({count: this.transport.length}) + "'>" +
translate(key_local, {count: this.transport.length}) +
"</span></td><td>";
transport +=
ConnectionIndicator.getStringFromArray(data.remotePort);
@ -11643,6 +11639,7 @@ var defaultOptions = {
defaultValueFromContent: false,
app: interfaceConfig.APP_NAME,
getAsync: false,
defaultValueFromContent: false,
customLoad: function(lng, ns, options, done) {
var resPath = "lang/__ns__-__lng__.json";
if(lng === languages.EN)

46
modules/UI/videolayout/ConnectionIndicator.js
View File

@ -229,47 +229,43 @@ ConnectionIndicator.prototype.generateText = function () {
}
var local_address_key = "connectionindicator." +
(data.localIP.length > 1? "localaddresses" : "localaddress");
var remote_address_key = "connectionindicator." +
(data.remoteIP.length > 1? "remoteaddresses" : "remoteaddress");
var local_address_key = "connectionindicator.localaddress";
var remote_address_key = "connectionindicator.remoteaddress";
var localTransport =
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
local_address_key +"'>" +
translate(local_address_key) + "</span></td><td> " +
local_address_key +"' data-i18n-options='" +
JSON.stringify({count: data.localIP.length}) + "'>" +
translate(local_address_key, {count: data.localIP.length}) +
"</span></td><td> " +
ConnectionIndicator.getStringFromArray(data.localIP) +
"</td></tr>";
transport =
"<tr><td><span class='jitsipopover_blue' data-i18n='" +
remote_address_key + "'>" +
translate(remote_address_key) + "</span></td><td> " +
remote_address_key + "' data-i18n-options='" +
JSON.stringify({count: data.remoteIP.length}) + "'>" +
translate(remote_address_key,
{count: data.remoteIP.length}) +
"</span></td><td> " +
ConnectionIndicator.getStringFromArray(data.remoteIP) +
"</td></tr>";
var key_remote = "connectionindicator.",
key_local = "connectionindicator.";
if(this.transport.length > 1)
{
key_remote += "remoteports";
key_local += "localports";
}
else
{
key_remote += "remoteport";
key_local += "localport";
}
var key_remote = "connectionindicator.remoteport",
key_local = "connectionindicator.localport";
transport += "<tr>" +
"<td>" +
"<span class='jitsipopover_blue' data-i18n='" + key_remote +
"'>" +
translate(key_remote) + "</span></td><td>";
"' data-i18n-options='" +
JSON.stringify({count: this.transport.length}) + "'>" +
translate(key_remote, {count: this.transport.length}) +
"</span></td><td>";
localTransport += "<tr>" +
"<td>" +
"<span class='jitsipopover_blue' data-i18n='" + key_local +
"'>" +
translate(key_local) + "</span></td><td>";
"' data-i18n-options='" +
JSON.stringify({count: this.transport.length}) + "'>" +
translate(key_local, {count: this.transport.length}) +
"</span></td><td>";
transport +=
ConnectionIndicator.getStringFromArray(data.remotePort);

1
modules/translation/translation.js
View File

@ -26,6 +26,7 @@ var defaultOptions = {
defaultValueFromContent: false,
app: interfaceConfig.APP_NAME,
getAsync: false,
defaultValueFromContent: false,
customLoad: function(lng, ns, options, done) {
var resPath = "lang/__ns__-__lng__.json";
if(lng === languages.EN)