apitech
/
jitsi-meet
mirror of https://github.com/jitsi/jitsi-meet
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes some translation issues.

Browse Source
pull/228/merge 415
hristoterezov 11 years ago
parent 3747251821
commit d2f95f3c81
13 changed files with 118 additions and 65 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 1
      app.js
  3. 18
      config.js
  4. 2
      css/jitsi_popover.css
  5. 4
      css/settingsmenu.css
  6. 2
      index.html
  7. 2
      interface_config.js
  8. 17
      lang/main.json
  9. 7
      modules/UI/UI.js
  10. 7
      modules/UI/prezi/Prezi.js
  11. 12
      modules/UI/side_pannels/contactlist/ContactList.js
  12. 35
      modules/UI/toolbars/Toolbar.js
  13. 74
      modules/UI/videolayout/VideoLayout.js

2
Makefile
Unescape View File

@ -21,4 +21,4 @@ clean:
deploy: deploy:
@mkdir -p $(DEPLOY_DIR) && cp $(OUTPUT_DIR)/*.bundle.js $(DEPLOY_DIR) @mkdir -p $(DEPLOY_DIR) && cp $(OUTPUT_DIR)/*.bundle.js $(DEPLOY_DIR)
scp $(DEPLOY_DIR)/app.bundle.js hristo.jitsi.net:/srv/web/hristo.jitsi.net/$(DEPLOY_DIR)

1
app.js
Unescape View File

@ -14,6 +14,7 @@ var APP =
this.xmpp = require("./modules/xmpp/xmpp"); this.xmpp = require("./modules/xmpp/xmpp");
this.keyboardshortcut = require("./modules/keyboardshortcut/keyboardshortcut"); this.keyboardshortcut = require("./modules/keyboardshortcut/keyboardshortcut");
this.translation = require("./modules/translation/translation"); this.translation = require("./modules/translation/translation");
this.settings = require("./modules/settings/Settings");
} }
}; };

18
config.js
Unescape View File

@ -1,9 +1,10 @@
var config = { var config = {
hosts: { hosts: {
domain: 'jitsi-meet.example.com', domain: 'hristo.jitsi.net',
//anonymousdomain: 'guest.example.com', //anonymousdomain: 'guest.example.com',
muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030 // anonymousdomain: 'guest.hristo.jitsi.net',
bridge: 'jitsi-videobridge.jitsi-meet.example.com', // FIXME: use XEP-0030 muc: 'conference.hristo.jitsi.net', // FIXME: use XEP-0030
bridge: 'jitsi-videobridge.hristo.jitsi.net', // FIXME: use XEP-0030
//jirecon: 'jirecon.jitsi-meet.example.com', //jirecon: 'jirecon.jitsi-meet.example.com',
//call_control: 'callcontrol.jitsi-meet.example.com', //call_control: 'callcontrol.jitsi-meet.example.com',
//focus: 'focus.jitsi-meet.example.com' - defaults to 'focus.jitsi-meet.example.com' //focus: 'focus.jitsi-meet.example.com' - defaults to 'focus.jitsi-meet.example.com'
@ -12,11 +13,12 @@ var config = {
// useStunTurn: true, // use XEP-0215 to fetch STUN and TURN server // useStunTurn: true, // use XEP-0215 to fetch STUN and TURN server
// useIPv6: true, // ipv6 support. use at your own risk // useIPv6: true, // ipv6 support. use at your own risk
useNicks: false, useNicks: false,
bosh: '//jitsi-meet.example.com/http-bind', // FIXME: use xep-0156 for that bosh: '//hristo.jitsi.net/http-bind', // FIXME: use xep-0156 for that
clientNode: 'http://jitsi.org/jitsimeet', // The name of client node advertised in XEP-0115 'c' stanza clientNode: 'http://jitsi.org/jitsimeet', // The name of client node advertised in XEP-0115 'c' stanza
//focusUserJid: 'focus@auth.jitsi-meet.example.com', // The real JID of focus participant - can be overridden here //focusUserJid: 'focus@auth.jitsi-meet.example.com', // The real JID of focus participant - can be overridden here
//defaultSipNumber: '', // Default SIP number defaultSipNumber: '123', // Default SIP number
desktopSharing: 'ext', // Desktop sharing method. Can be set to 'ext', 'webrtc' or false to disable. desktopSharing: 'ext', // Desktop sharing method. Can be set to 'ext', 'webrtc' or false to disable.
// resolution: "1080",
chromeExtensionId: 'diibjkoicjeejcmhdnailmkgecihlobk', // Id of desktop streamer Chrome extension chromeExtensionId: 'diibjkoicjeejcmhdnailmkgecihlobk', // Id of desktop streamer Chrome extension
desktopSharingSources: ['screen', 'window'], desktopSharingSources: ['screen', 'window'],
minChromeExtVersion: '0.1', // Required version of Chrome extension minChromeExtVersion: '0.1', // Required version of Chrome extension
@ -26,9 +28,9 @@ var config = {
channelLastN: -1, // The default value of the channel attribute last-n. channelLastN: -1, // The default value of the channel attribute last-n.
adaptiveLastN: false, adaptiveLastN: false,
adaptiveSimulcast: false, adaptiveSimulcast: false,
useRtcpMux: true, useRtcpMux: false,
useBundle: true, useBundle: false,
enableRecording: false, enableRecording: true,
enableWelcomePage: true, enableWelcomePage: true,
enableSimulcast: false, enableSimulcast: false,
enableFirefoxSupport: false, //firefox support is still experimental, only one-to-one conferences with chrome focus enableFirefoxSupport: false, //firefox support is still experimental, only one-to-one conferences with chrome focus

2
css/jitsi_popover.css
Unescape View File

@ -99,5 +99,7 @@
width: 90px; width: 90px;
height: 16px; height: 16px;
padding-top: 4px; padding-top: 4px;
padding-left: 10px;
padding-right: 10px;
margin: 15px auto 0px auto; margin: 15px auto 0px auto;
} }

4
css/settingsmenu.css
Unescape View File

@ -27,8 +27,8 @@
} }
#settingsmenu button { #settingsmenu button {
width: 36%; width: 45%;
left: 32%; left: 26%;
padding: 0; padding: 0;
margin-top: 10px; margin-top: 10px;
} }

2
index.html
Unescape View File

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=31"></script> <script src="libs/app.bundle.js?v=32"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=6"/> <link rel="stylesheet" href="css/font.css?v=6"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

2
interface_config.js
Unescape View File

@ -5,7 +5,7 @@ var interfaceConfig = {
INITIAL_TOOLBAR_TIMEOUT: 20000, INITIAL_TOOLBAR_TIMEOUT: 20000,
TOOLBAR_TIMEOUT: 4000, TOOLBAR_TIMEOUT: 4000,
DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster", DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "Speaker", DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "speaker",
DEFAULT_LOCAL_DISPLAY_NAME: "me", DEFAULT_LOCAL_DISPLAY_NAME: "me",
SHOW_JITSI_WATERMARK: true, SHOW_JITSI_WATERMARK: true,
JITSI_WATERMARK_LINK: "http://jitsi.org", JITSI_WATERMARK_LINK: "http://jitsi.org",

17
lang/main.json
Unescape View File

@ -3,6 +3,12 @@
"connectionsettings": "Connection Settings", "connectionsettings": "Connection Settings",
"poweredby": "powered by", "poweredby": "powered by",
"downloadlogs": "Download logs", "downloadlogs": "Download logs",
"roomUrlDefaultMsg": "Your conference is currently being created...",
"participant": "Participant",
"me": "me",
"speaker": "Speaker",
"defaultNickname": "ex. __name__",
"defaultPreziLink": "e.g. __url__",
"welcomepage":{ "welcomepage":{
"go": "GO", "go": "GO",
"roomname": "Enter room name", "roomname": "Enter room name",
@ -60,8 +66,8 @@
}, },
"bottomtoolbar": { "bottomtoolbar": {
"chat": "Open / close chat", "chat": "Open / close chat",
"filmstrip": "Open / close contact list", "filmstrip": "Show / hide film strip",
"contactlist": "Show / hide film strip" "contactlist": "Open / close contact list"
}, },
"chat":{ "chat":{
"nickname": { "nickname": {
@ -182,6 +188,11 @@
"password": "password", "password": "password",
"userPassword": "user password", "userPassword": "user password",
"token": "token" "token": "token"
},
"email":
{
"sharedKey": "This conference is password protected. Please use the following pin when joining:%0D%0A%0D%0A __sharedKey__ %0D%0A%0D%0A",
"subject": "Invitation to a __appName__ (__conferenceName__)",
"body": "Hey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.%0D%0A%0D%0APlease click on the following link in order to join the conference.%0D%0A%0D%0A __roomUrl__%0D%0A%0D%0A__sharedKeyText__ Note that __appName__ is currently only supported by Chromium, Google Chrome and Opera, so you need to be using one of these browsers.%0D%0A%0D%0ATalk to you in a sec!"
} }
} }

7
modules/UI/UI.js
Unescape View File

@ -393,9 +393,8 @@ function updateChatConversation(from, displayName, message) {
function onMucJoined(jid, info) { function onMucJoined(jid, info) {
Toolbar.updateRoomUrl(window.location.href); Toolbar.updateRoomUrl(window.location.href);
document.getElementById('localNick').appendChild( var meHTML = APP.translation.generateTranslatonHTML("me");
document.createTextNode(Strophe.getResourceFromJid(jid) + ' (me)') $("#localNick").html(Strophe.getResourceFromJid(jid) + " (" + meHTML + ")");
);
var settings = Settings.getSettings(); var settings = Settings.getSettings();
// Add myself to the contact list. // Add myself to the contact list.
@ -408,7 +407,7 @@ function onMucJoined(jid, info) {
? info.displayName : Strophe.getResourceFromJid(jid); ? info.displayName : Strophe.getResourceFromJid(jid);
if (displayName) if (displayName)
onDisplayNameChanged('localVideoContainer', displayName + ' (me)'); onDisplayNameChanged('localVideoContainer', displayName);
} }
function initEtherpad(name) { function initEtherpad(name) {

7
modules/UI/prezi/Prezi.js
Unescape View File

@ -73,12 +73,15 @@ var Prezi = {
buttons1.button2 = {title: backButton, value: true}; buttons1.button2 = {title: backButton, value: true};
var linkError = APP.translation.generateTranslatonHTML( var linkError = APP.translation.generateTranslatonHTML(
"dialog.preziLinkError"); "dialog.preziLinkError");
var defaultUrl = APP.translation.translateString("defaultPreziLink",
{url: "http://prezi.com/wz7vhjycl7e6/my-prezi"});
var openPreziState = { var openPreziState = {
state0: { state0: {
html: '<h2>' + html + '</h2>' + html: '<h2>' + html + '</h2>' +
'<input id="preziUrl" type="text" ' + '<input id="preziUrl" type="text" ' +
'placeholder="e.g. ' + 'data-i18n="[placeholder]defaultPreziLink" data-i18n-options=\'' +
'http://prezi.com/wz7vhjycl7e6/my-prezi" autofocus>', JSON.stringify({"url": "http://prezi.com/wz7vhjycl7e6/my-prezi"}) +
'\' placeholder="' + defaultUrl + '" autofocus>',
persistent: false, persistent: false,
buttons: buttons, buttons: buttons,
defaultButton: 1, defaultButton: 1,

12
modules/UI/side_pannels/contactlist/ContactList.js
Unescape View File

@ -38,9 +38,15 @@ function createAvatar(id) {
* *
* @param displayName the display name to set * @param displayName the display name to set
*/ */
function createDisplayNameParagraph(displayName) { function createDisplayNameParagraph(key, displayName) {
var p = document.createElement('p'); var p = document.createElement('p');
p.innerText = displayName; if(displayName)
p.innerText = displayName;
else if(key)
{
p.setAttribute("data-i18n",key);
p.innerText = APP.translation.translateString(key);
}
return p; return p;
} }
@ -106,7 +112,7 @@ var ContactList = {
}; };
newContact.appendChild(createAvatar(id)); newContact.appendChild(createAvatar(id));
newContact.appendChild(createDisplayNameParagraph("Participant")); newContact.appendChild(createDisplayNameParagraph("participant"));
var clElement = contactlist.get(0); var clElement = contactlist.get(0);

35
modules/UI/toolbars/Toolbar.js
Unescape View File

@ -197,25 +197,16 @@ function inviteParticipants() {
var sharedKeyText = ""; var sharedKeyText = "";
if (sharedKey && sharedKey.length > 0) { if (sharedKey && sharedKey.length > 0) {
sharedKeyText = sharedKeyText =
"This conference is password protected. Please use the " + APP.translation.translateString("email.sharedKey",
"following pin when joining:%0D%0A%0D%0A" + {sharedKey: sharedKey});
sharedKey + "%0D%0A%0D%0A";
} }
var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1); var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
var subject = "Invitation to a " + interfaceConfig.APP_NAME + " (" + conferenceName + ")"; var subject = APP.translation.translateString("email.subject",
var body = "Hey there, I%27d like to invite you to a " + interfaceConfig.APP_NAME + {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
" conference I%27ve just set up.%0D%0A%0D%0A" + var body = APP.translation.translateString("email.body",
"Please click on the following link in order" + {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
" to join the conference.%0D%0A%0D%0A" + roomUrl: roomUrl});
roomUrl +
"%0D%0A%0D%0A" +
sharedKeyText +
"Note that " + interfaceConfig.APP_NAME + " is currently" +
" only supported by Chromium," +
" Google Chrome and Opera, so you need" +
" to be using one of these browsers.%0D%0A%0D%0A" +
"Talk to you in a sec!";
if (window.localStorage.displayname) { if (window.localStorage.displayname) {
body += "%0D%0A%0D%0A" + window.localStorage.displayname; body += "%0D%0A%0D%0A" + window.localStorage.displayname;
@ -409,16 +400,18 @@ var Toolbar = (function (my) {
* Opens the invite link dialog. * Opens the invite link dialog.
*/ */
my.openLinkDialog = function () { my.openLinkDialog = function () {
var inviteLink; var inviteAttreibutes;
if (roomUrl === null) { if (roomUrl === null) {
inviteLink = "Your conference is currently being created..."; inviteAttreibutes = 'data-i18n="[value]roomUrlDefaultMsg" value="' +
APP.translation.translateString("roomUrlDefaultMsg") + '"';
} else { } else {
inviteLink = encodeURI(roomUrl); inviteAttreibutes = "value=\"" + encodeURI(roomUrl) + "\"";
} }
messageHandler.openTwoButtonDialog("dialog.shareLink", messageHandler.openTwoButtonDialog("dialog.shareLink",
null, null, null, null,
'<input id="inviteLinkRef" type="text" value="' + '<input id="inviteLinkRef" type="text" ' +
inviteLink + '" onclick="this.select();" readonly>', inviteAttreibutes + ' onclick="this.select();" readonly>',
false, false,
"dialog.Invite", "dialog.Invite",
function (e, v) { function (e, v) {

74
modules/UI/videolayout/VideoLayout.js
Unescape View File

@ -191,9 +191,10 @@ function getCameraVideoSize(videoWidth,
/** /**
* Sets the display name for the given video span id. * Sets the display name for the given video span id.
*/ */
function setDisplayName(videoSpanId, displayName) { function setDisplayName(videoSpanId, displayName, key) {
var nameSpan = $('#' + videoSpanId + '>span.displayname'); var nameSpan = $('#' + videoSpanId + '>span.displayname');
var defaultLocalDisplayName = interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME; var defaultLocalDisplayName = APP.translation.generateTranslatonHTML(
interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
// If we already have a display name for this video. // If we already have a display name for this video.
if (nameSpan.length > 0) { if (nameSpan.length > 0) {
@ -202,14 +203,25 @@ function setDisplayName(videoSpanId, displayName) {
if (nameSpanElement.id === 'localDisplayName' && if (nameSpanElement.id === 'localDisplayName' &&
$('#localDisplayName').text() !== displayName) { $('#localDisplayName').text() !== displayName) {
if (displayName && displayName.length > 0) if (displayName && displayName.length > 0)
$('#localDisplayName').html(displayName + ' (me)'); {
var meHTML = APP.translation.generateTranslatonHTML("me");
$('#localDisplayName').html(displayName + ' (' + meHTML + ')');
}
else else
$('#localDisplayName').text(defaultLocalDisplayName); $('#localDisplayName').html(defaultLocalDisplayName);
} else { } else {
if (displayName && displayName.length > 0) if (displayName && displayName.length > 0)
{
$('#' + videoSpanId + '_name').html(displayName); $('#' + videoSpanId + '_name').html(displayName);
}
else if (key && key.length > 0)
{
var nameHtml = APP.translation.generateTranslatonHTML(key);
$('#' + videoSpanId + '_name').html(nameHtml);
}
else else
$('#' + videoSpanId + '_name').text(interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME); $('#' + videoSpanId + '_name').text(
interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME);
} }
} else { } else {
var editButton = null; var editButton = null;
@ -220,16 +232,23 @@ function setDisplayName(videoSpanId, displayName) {
if (videoSpanId === 'localVideoContainer') { if (videoSpanId === 'localVideoContainer') {
editButton = createEditDisplayNameButton(); editButton = createEditDisplayNameButton();
nameSpan.innerText = defaultLocalDisplayName; if (displayName && displayName.length > 0) {
var meHTML = APP.translation.generateTranslatonHTML("me");
nameSpan.innerHTML = displayName + meHTML;
}
else
nameSpan.innerHTML = defaultLocalDisplayName;
} }
else { else {
nameSpan.innerText = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME; if (displayName && displayName.length > 0) {
}
if (displayName && displayName.length > 0) { nameSpan.innerText = displayName;
nameSpan.innerText = displayName; }
else
nameSpan.innerText = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
} }
if (!editButton) { if (!editButton) {
nameSpan.id = videoSpanId + '_name'; nameSpan.id = videoSpanId + '_name';
} else { } else {
@ -245,11 +264,18 @@ function setDisplayName(videoSpanId, displayName) {
if (displayName && displayName.length) { if (displayName && displayName.length) {
editableText.value editableText.value
= displayName.substring(0, displayName.indexOf(' (me)')); = displayName;
} }
var defaultNickname = APP.translation.translateString(
"defaultNickname", {name: "Jane Pink"});
editableText.setAttribute('style', 'display:none;'); editableText.setAttribute('style', 'display:none;');
editableText.setAttribute('placeholder', 'ex. Jane Pink'); editableText.setAttribute('data-18n',
'[placeholder]defaultNickname');
editableText.setAttribute("data-i18n-options",
JSON.stringify({name: "Jane Pink"}));
editableText.setAttribute("placeholder", defaultNickname);
$('#' + videoSpanId)[0].appendChild(editableText); $('#' + videoSpanId)[0].appendChild(editableText);
$('#localVideoContainer .displayname') $('#localVideoContainer .displayname')
@ -1270,10 +1296,17 @@ var VideoLayout = (function (my) {
if (!$('#localDisplayName').is(":visible")) { if (!$('#localDisplayName').is(":visible")) {
if (NicknameHandler.getNickname()) if (NicknameHandler.getNickname())
$('#localDisplayName').text(NicknameHandler.getNickname() + " (me)"); {
var meHTML = APP.translation.generateTranslatonHTML("me");
$('#localDisplayName').html(NicknameHandler.getNickname() + " (" + meHTML + ")");
}
else else
{
var defaultHTML = APP.translation.generateTranslatonHTML(
interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
$('#localDisplayName') $('#localDisplayName')
.text(interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME); .html(defaultHTML);
}
$('#localDisplayName').show(); $('#localDisplayName').show();
} }
@ -1796,17 +1829,20 @@ var VideoLayout = (function (my) {
=== APP.xmpp.myResource()) === APP.xmpp.myResource())
return; return;
var members = APP.xmpp.getMembers();
// Update the current dominant speaker. // Update the current dominant speaker.
if (resourceJid !== currentDominantSpeaker) { if (resourceJid !== currentDominantSpeaker) {
var oldSpeakerVideoSpanId = "participant_" + currentDominantSpeaker, var oldSpeakerVideoSpanId = "participant_" + currentDominantSpeaker,
newSpeakerVideoSpanId = "participant_" + resourceJid; newSpeakerVideoSpanId = "participant_" + resourceJid;
if($("#" + oldSpeakerVideoSpanId + ">span.displayname").text() === var currentJID = APP.xmpp.findJidFromResource(currentDominantSpeaker);
interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME) { var newJID = APP.xmpp.findJidFromResource(resourceJid);
if(currentDominantSpeaker && (!members || !members[currentJID] ||
!members[currentJID].displayName)) {
setDisplayName(oldSpeakerVideoSpanId, null); setDisplayName(oldSpeakerVideoSpanId, null);
} }
if($("#" + newSpeakerVideoSpanId + ">span.displayname").text() === if(resourceJid && (!members || !members[newJID] ||
interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME) { !members[newJID].displayName)) {
setDisplayName(newSpeakerVideoSpanId, setDisplayName(newSpeakerVideoSpanId, null,
interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME); interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME);
} }
currentDominantSpeaker = resourceJid; currentDominantSpeaker = resourceJid;

Write Preview
Loading…
Cancel
Save