Fixes translation of plurals.
This commit is contained in:
hristoterezov
parent
af682f8727
commit
6f12446c99
|
|
@ -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=24"></script>
|
||||
<script src="libs/app.bundle.js?v=25"></script>
|
||||
<script src="analytics.js?v=1"></script><!-- google analytics plugin -->
|
||||
<link rel="stylesheet" href="css/font.css?v=6"/>
|
||||
<link rel="stylesheet" href="css/toastr.css?v=1">
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -11630,7 +11626,6 @@ var defaultOptions = {
|
|||
detectLngQS: "lang",
|
||||
useCookie: false,
|
||||
fallbackLng: DEFAULT_LANG,
|
||||
shortcutFunction: 'defaultValue',
|
||||
load: "unspecific",
|
||||
resGetPath: 'lang/__ns__-__lng__.json',
|
||||
ns: {
|
||||
|
|
@ -11643,6 +11638,7 @@ var defaultOptions = {
|
|||
useDataAttrOptions: true,
|
||||
app: interfaceConfig.APP_NAME,
|
||||
getAsync: false,
|
||||
defaultValueFromContent: false,
|
||||
customLoad: function(lng, ns, options, done) {
|
||||
var resPath = "lang/__ns__-__lng__.json";
|
||||
if(lng === languages.EN)
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ var defaultOptions = {
|
|||
detectLngQS: "lang",
|
||||
useCookie: false,
|
||||
fallbackLng: DEFAULT_LANG,
|
||||
shortcutFunction: 'defaultValue',
|
||||
load: "unspecific",
|
||||
resGetPath: 'lang/__ns__-__lng__.json',
|
||||
ns: {
|
||||
|
|
@ -26,6 +25,7 @@ var defaultOptions = {
|
|||
useDataAttrOptions: true,
|
||||
app: interfaceConfig.APP_NAME,
|
||||
getAsync: false,
|
||||
defaultValueFromContent: false,
|
||||
customLoad: function(lng, ns, options, done) {
|
||||
var resPath = "lang/__ns__-__lng__.json";
|
||||
if(lng === languages.EN)
|
||||
|
|
|
|||
Loading…
Reference in New Issue