Переглянути джерело

Fixes typo in translation module interface.

master
hristoterezov 10 роки тому
джерело
коміт
62a731e244

+ 1
- 1
index.html Переглянути файл

22
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
22
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
23
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
23
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
24
     <script src="interface_config.js?v=5"></script>
24
     <script src="interface_config.js?v=5"></script>
25
-    <script src="libs/app.bundle.js?v=95"></script>
25
+    <script src="libs/app.bundle.js?v=96"></script>
26
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
26
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
27
     <link rel="stylesheet" href="css/font.css?v=7"/>
27
     <link rel="stylesheet" href="css/font.css?v=7"/>
28
     <link rel="stylesheet" href="css/toastr.css?v=1">
28
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 2
- 2
lang/Translation.md Переглянути файл

30
  ```
30
  ```
31
 
31
 
32
 
32
 
33
- You can also use APP.translation.generateTranslatonHTML(key, options) to get this HTML code as Javascript string.
33
+ You can also use APP.translation.generateTranslationHTML(key, options) to get this HTML code as Javascript string.
34
 
34
 
35
 
35
 
36
  ```
36
  ```
37
- APP.translation.generateTranslatonHTML("dialog.OK") // returns <span data-i18n="dialog.OK">OK</span>
37
+ APP.translation.generateTranslationHTML("dialog.OK") // returns <span data-i18n="dialog.OK">OK</span>
38
  ```
38
  ```
39
  
39
  
40
  The value in the options parameter will be added in data-i18n-options attribute of the element.
40
  The value in the options parameter will be added in data-i18n-options attribute of the element.

+ 40
- 40
libs/app.bundle.js Переглянути файл

1564
         '" autofocus>';
1564
         '" autofocus>';
1565
 
1565
 
1566
     var buttonTxt
1566
     var buttonTxt
1567
-        = APP.translation.generateTranslatonHTML("dialog.Ok");
1567
+        = APP.translation.generateTranslationHTML("dialog.Ok");
1568
     var buttons = [];
1568
     var buttons = [];
1569
     buttons.push({title: buttonTxt, value: "ok"});
1569
     buttons.push({title: buttonTxt, value: "ok"});
1570
 
1570
 
1642
 
1642
 
1643
 function onXmppConnectionFailed(stropheErrorMsg) {
1643
 function onXmppConnectionFailed(stropheErrorMsg) {
1644
 
1644
 
1645
-    var title = APP.translation.generateTranslatonHTML(
1645
+    var title = APP.translation.generateTranslationHTML(
1646
         "dialog.error");
1646
         "dialog.error");
1647
 
1647
 
1648
     var message;
1648
     var message;
1649
     if (stropheErrorMsg) {
1649
     if (stropheErrorMsg) {
1650
-        message = APP.translation.generateTranslatonHTML(
1650
+        message = APP.translation.generateTranslationHTML(
1651
             "dialog.connectErrorWithMsg", {msg: stropheErrorMsg});
1651
             "dialog.connectErrorWithMsg", {msg: stropheErrorMsg});
1652
     } else {
1652
     } else {
1653
-        message = APP.translation.generateTranslatonHTML(
1653
+        message = APP.translation.generateTranslationHTML(
1654
             "dialog.connectError");
1654
             "dialog.connectError");
1655
     }
1655
     }
1656
 
1656
 
1731
         );
1731
         );
1732
     });
1732
     });
1733
     APP.xmpp.addListener(XMPPEvents.RESERVATION_ERROR, function (code, msg) {
1733
     APP.xmpp.addListener(XMPPEvents.RESERVATION_ERROR, function (code, msg) {
1734
-        var title = APP.translation.generateTranslatonHTML(
1734
+        var title = APP.translation.generateTranslationHTML(
1735
             "dialog.reservationError");
1735
             "dialog.reservationError");
1736
-        var message = APP.translation.generateTranslatonHTML(
1736
+        var message = APP.translation.generateTranslationHTML(
1737
             "dialog.reservationErrorMsg", {code: code, msg: msg});
1737
             "dialog.reservationErrorMsg", {code: code, msg: msg});
1738
         messageHandler.openDialog(
1738
         messageHandler.openDialog(
1739
             title,
1739
             title,
1752
     APP.xmpp.addListener(XMPPEvents.MUC_DESTROYED, function (reason) {
1752
     APP.xmpp.addListener(XMPPEvents.MUC_DESTROYED, function (reason) {
1753
         //FIXME: use Session Terminated from translation, but
1753
         //FIXME: use Session Terminated from translation, but
1754
         // 'reason' text comes from XMPP packet and is not translated
1754
         // 'reason' text comes from XMPP packet and is not translated
1755
-        var title = APP.translation.generateTranslatonHTML("dialog.sessTerminated");
1755
+        var title = APP.translation.generateTranslationHTML("dialog.sessTerminated");
1756
         messageHandler.openDialog(
1756
         messageHandler.openDialog(
1757
             title, reason, true, {},
1757
             title, reason, true, {},
1758
             function (event, value, message, formVals)
1758
             function (event, value, message, formVals)
1979
 
1979
 
1980
 function onMucJoined(jid, info) {
1980
 function onMucJoined(jid, info) {
1981
     Toolbar.updateRoomUrl(window.location.href);
1981
     Toolbar.updateRoomUrl(window.location.href);
1982
-    var meHTML = APP.translation.generateTranslatonHTML("me");
1982
+    var meHTML = APP.translation.generateTranslationHTML("me");
1983
     $("#localNick").html(Strophe.getResourceFromJid(jid) + " (" + meHTML + ")");
1983
     $("#localNick").html(Strophe.getResourceFromJid(jid) + " (" + meHTML + ")");
1984
 
1984
 
1985
     var settings = Settings.getSettings();
1985
     var settings = Settings.getSettings();
2778
         var room = roomName.substr(0, roomName.indexOf('@'));
2778
         var room = roomName.substr(0, roomName.indexOf('@'));
2779
 
2779
 
2780
         var title
2780
         var title
2781
-            = APP.translation.generateTranslatonHTML("dialog.WaitingForHost");
2781
+            = APP.translation.generateTranslationHTML("dialog.WaitingForHost");
2782
         var msg
2782
         var msg
2783
-            = APP.translation.generateTranslatonHTML(
2783
+            = APP.translation.generateTranslationHTML(
2784
                     "dialog.WaitForHostMsg", {room: room});
2784
                     "dialog.WaitForHostMsg", {room: room});
2785
 
2785
 
2786
         var buttonTxt
2786
         var buttonTxt
2787
-            = APP.translation.generateTranslatonHTML("dialog.IamHost");
2787
+            = APP.translation.generateTranslationHTML("dialog.IamHost");
2788
         var buttons = [];
2788
         var buttons = [];
2789
         buttons.push({title: buttonTxt, value: "authNow"});
2789
         buttons.push({title: buttonTxt, value: "authNow"});
2790
 
2790
 
2912
         'type="password" data-i18n="[placeholder]dialog.userPassword"' +
2912
         'type="password" data-i18n="[placeholder]dialog.userPassword"' +
2913
         ' placeholder="user password">';
2913
         ' placeholder="user password">';
2914
 
2914
 
2915
-    var okButton = APP.translation.generateTranslatonHTML("dialog.Ok");
2915
+    var okButton = APP.translation.generateTranslationHTML("dialog.Ok");
2916
 
2916
 
2917
-    var cancelButton = APP.translation.generateTranslatonHTML("dialog.Cancel");
2917
+    var cancelButton = APP.translation.generateTranslationHTML("dialog.Cancel");
2918
 
2918
 
2919
     var states = {
2919
     var states = {
2920
         login: {
2920
         login: {
3389
             );
3389
             );
3390
         }
3390
         }
3391
         else {
3391
         else {
3392
-            var html = APP.translation.generateTranslatonHTML(
3392
+            var html = APP.translation.generateTranslationHTML(
3393
                 "dialog.sharePreziTitle");
3393
                 "dialog.sharePreziTitle");
3394
-            var cancelButton = APP.translation.generateTranslatonHTML(
3394
+            var cancelButton = APP.translation.generateTranslationHTML(
3395
                 "dialog.Cancel");
3395
                 "dialog.Cancel");
3396
-            var shareButton = APP.translation.generateTranslatonHTML(
3396
+            var shareButton = APP.translation.generateTranslationHTML(
3397
                 "dialog.Share");
3397
                 "dialog.Share");
3398
-            var backButton = APP.translation.generateTranslatonHTML(
3398
+            var backButton = APP.translation.generateTranslationHTML(
3399
                 "dialog.Back");
3399
                 "dialog.Back");
3400
             var buttons = [];
3400
             var buttons = [];
3401
             var buttons1 = [];
3401
             var buttons1 = [];
3406
             buttons.push({title: shareButton, value: true});
3406
             buttons.push({title: shareButton, value: true});
3407
             // Back button
3407
             // Back button
3408
             buttons1.push({title: backButton, value: true});
3408
             buttons1.push({title: backButton, value: true});
3409
-            var linkError = APP.translation.generateTranslatonHTML(
3409
+            var linkError = APP.translation.generateTranslationHTML(
3410
                 "dialog.preziLinkError");
3410
                 "dialog.preziLinkError");
3411
             var defaultUrl = APP.translation.translateString("defaultPreziLink",
3411
             var defaultUrl = APP.translation.translateString("defaultPreziLink",
3412
                 {url: "http://prezi.com/wz7vhjycl7e6/my-prezi"});
3412
                 {url: "http://prezi.com/wz7vhjycl7e6/my-prezi"});
5201
 
5201
 
5202
     }
5202
     }
5203
 
5203
 
5204
-    var title = APP.translation.generateTranslatonHTML(
5204
+    var title = APP.translation.generateTranslationHTML(
5205
         "dialog.sessTerminated");
5205
         "dialog.sessTerminated");
5206
-    var msg = APP.translation.generateTranslatonHTML(
5206
+    var msg = APP.translation.generateTranslationHTML(
5207
         "dialog.hungUp");
5207
         "dialog.hungUp");
5208
-    var button = APP.translation.generateTranslatonHTML(
5208
+    var button = APP.translation.generateTranslationHTML(
5209
         "dialog.joinAgain");
5209
         "dialog.joinAgain");
5210
     var buttons = [];
5210
     var buttons = [];
5211
     buttons.push({title: button, value: true});
5211
     buttons.push({title: button, value: true});
5229
 
5229
 
5230
 function toggleRecording() {
5230
 function toggleRecording() {
5231
     APP.xmpp.toggleRecording(function (callback) {
5231
     APP.xmpp.toggleRecording(function (callback) {
5232
-        var msg = APP.translation.generateTranslatonHTML(
5232
+        var msg = APP.translation.generateTranslationHTML(
5233
             "dialog.recordingToken");
5233
             "dialog.recordingToken");
5234
         var token = APP.translation.translateString("dialog.token");
5234
         var token = APP.translation.translateString("dialog.token");
5235
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
5235
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
5334
     var defaultNumber
5334
     var defaultNumber
5335
         = config.defaultSipNumber ? config.defaultSipNumber : '';
5335
         = config.defaultSipNumber ? config.defaultSipNumber : '';
5336
 
5336
 
5337
-    var sipMsg = APP.translation.generateTranslatonHTML(
5337
+    var sipMsg = APP.translation.generateTranslationHTML(
5338
         "dialog.sipMsg");
5338
         "dialog.sipMsg");
5339
     messageHandler.openTwoButtonDialog(null, null, null,
5339
     messageHandler.openTwoButtonDialog(null, null, null,
5340
         '<h2>' + sipMsg + '</h2>' +
5340
         '<h2>' + sipMsg + '</h2>' +
5474
                         }
5474
                         }
5475
                     });
5475
                     });
5476
             } else {
5476
             } else {
5477
-                var msg = APP.translation.generateTranslatonHTML(
5477
+                var msg = APP.translation.generateTranslationHTML(
5478
                     "dialog.passwordMsg");
5478
                     "dialog.passwordMsg");
5479
                 var yourPassword = APP.translation.translateString(
5479
                 var yourPassword = APP.translation.translateString(
5480
                     "dialog.yourPassword");
5480
                     "dialog.yourPassword");
5544
      * FIXME: not used ?
5544
      * FIXME: not used ?
5545
      */
5545
      */
5546
     my.openSettingsDialog = function () {
5546
     my.openSettingsDialog = function () {
5547
-        var settings1 = APP.translation.generateTranslatonHTML(
5547
+        var settings1 = APP.translation.generateTranslationHTML(
5548
             "dialog.settings1");
5548
             "dialog.settings1");
5549
-        var settings2 = APP.translation.generateTranslatonHTML(
5549
+        var settings2 = APP.translation.generateTranslationHTML(
5550
             "dialog.settings2");
5550
             "dialog.settings2");
5551
-        var settings3 = APP.translation.generateTranslatonHTML(
5551
+        var settings3 = APP.translation.generateTranslationHTML(
5552
             "dialog.settings3");
5552
             "dialog.settings3");
5553
 
5553
 
5554
         var yourPassword = APP.translation.translateString(
5554
         var yourPassword = APP.translation.translateString(
6002
         var title = null;
6002
         var title = null;
6003
         if(titleKey)
6003
         if(titleKey)
6004
         {
6004
         {
6005
-            title = APP.translation.generateTranslatonHTML(titleKey);
6005
+            title = APP.translation.generateTranslationHTML(titleKey);
6006
         }
6006
         }
6007
-        var message = APP.translation.generateTranslatonHTML(messageKey);
6007
+        var message = APP.translation.generateTranslationHTML(messageKey);
6008
         $.prompt(message,
6008
         $.prompt(message,
6009
             {
6009
             {
6010
                 title: title,
6010
                 title: title,
6034
     {
6034
     {
6035
         var buttons = [];
6035
         var buttons = [];
6036
 
6036
 
6037
-        var leftButton = APP.translation.generateTranslatonHTML(leftButtonKey);
6037
+        var leftButton = APP.translation.generateTranslationHTML(leftButtonKey);
6038
         buttons.push({ title: leftButton, value: true});
6038
         buttons.push({ title: leftButton, value: true});
6039
 
6039
 
6040
         var cancelButton
6040
         var cancelButton
6041
-            = APP.translation.generateTranslatonHTML("dialog.Cancel");
6041
+            = APP.translation.generateTranslationHTML("dialog.Cancel");
6042
         buttons.push({title: cancelButton, value: false});
6042
         buttons.push({title: cancelButton, value: false});
6043
 
6043
 
6044
         var message = msgString, title = titleString;
6044
         var message = msgString, title = titleString;
6045
         if (titleKey)
6045
         if (titleKey)
6046
         {
6046
         {
6047
-            title = APP.translation.generateTranslatonHTML(titleKey);
6047
+            title = APP.translation.generateTranslationHTML(titleKey);
6048
         }
6048
         }
6049
         if (msgKey) {
6049
         if (msgKey) {
6050
-            message = APP.translation.generateTranslatonHTML(msgKey);
6050
+            message = APP.translation.generateTranslationHTML(msgKey);
6051
         }
6051
         }
6052
         $.prompt(message, {
6052
         $.prompt(message, {
6053
             title: title,
6053
             title: title,
7239
     }
7239
     }
7240
 
7240
 
7241
     var nameSpan = $('#' + this.videoSpanId + '>span.displayname');
7241
     var nameSpan = $('#' + this.videoSpanId + '>span.displayname');
7242
-    var defaultLocalDisplayName = APP.translation.generateTranslatonHTML(
7242
+    var defaultLocalDisplayName = APP.translation.generateTranslationHTML(
7243
         interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
7243
         interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
7244
 
7244
 
7245
     // If we already have a display name for this video.
7245
     // If we already have a display name for this video.
7248
         if (nameSpan.text() !== displayName) {
7248
         if (nameSpan.text() !== displayName) {
7249
             if (displayName && displayName.length > 0)
7249
             if (displayName && displayName.length > 0)
7250
             {
7250
             {
7251
-                var meHTML = APP.translation.generateTranslatonHTML("me");
7251
+                var meHTML = APP.translation.generateTranslationHTML("me");
7252
                 $('#localDisplayName').html(displayName + ' (' + meHTML + ')');
7252
                 $('#localDisplayName').html(displayName + ' (' + meHTML + ')');
7253
             }
7253
             }
7254
             else
7254
             else
7263
 
7263
 
7264
 
7264
 
7265
         if (displayName && displayName.length > 0) {
7265
         if (displayName && displayName.length > 0) {
7266
-            var meHTML = APP.translation.generateTranslatonHTML("me");
7266
+            var meHTML = APP.translation.generateTranslationHTML("me");
7267
             nameSpan.innerHTML = displayName + meHTML;
7267
             nameSpan.innerHTML = displayName + meHTML;
7268
         }
7268
         }
7269
         else {
7269
         else {
7327
     if (!$('#localDisplayName').is(":visible")) {
7327
     if (!$('#localDisplayName').is(":visible")) {
7328
         if (NicknameHandler.getNickname())
7328
         if (NicknameHandler.getNickname())
7329
         {
7329
         {
7330
-            var meHTML = APP.translation.generateTranslatonHTML("me");
7330
+            var meHTML = APP.translation.generateTranslationHTML("me");
7331
             $('#localDisplayName').html(NicknameHandler.getNickname() + " (" + meHTML + ")");
7331
             $('#localDisplayName').html(NicknameHandler.getNickname() + " (" + meHTML + ")");
7332
         }
7332
         }
7333
         else
7333
         else
7334
         {
7334
         {
7335
-            var defaultHTML = APP.translation.generateTranslatonHTML(
7335
+            var defaultHTML = APP.translation.generateTranslationHTML(
7336
                 interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
7336
                 interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
7337
             $('#localDisplayName')
7337
             $('#localDisplayName')
7338
                 .html(defaultHTML);
7338
                 .html(defaultHTML);
7768
         }
7768
         }
7769
         else if (key && key.length > 0)
7769
         else if (key && key.length > 0)
7770
         {
7770
         {
7771
-            var nameHtml = APP.translation.generateTranslatonHTML(key);
7771
+            var nameHtml = APP.translation.generateTranslationHTML(key);
7772
             $('#' + this.videoSpanId + '_name').html(nameHtml);
7772
             $('#' + this.videoSpanId + '_name').html(nameHtml);
7773
         }
7773
         }
7774
         else
7774
         else
11375
     translateElement: function (selector) {
11375
     translateElement: function (selector) {
11376
         selector.i18n();
11376
         selector.i18n();
11377
     },
11377
     },
11378
-    generateTranslatonHTML: function (key, options) {
11378
+    generateTranslationHTML: function (key, options) {
11379
         var str = "<span data-i18n=\"" + key + "\"";
11379
         var str = "<span data-i18n=\"" + key + "\"";
11380
         if(options)
11380
         if(options)
11381
         {
11381
         {

+ 8
- 8
modules/UI/UI.js Переглянути файл

44
         '" autofocus>';
44
         '" autofocus>';
45
 
45
 
46
     var buttonTxt
46
     var buttonTxt
47
-        = APP.translation.generateTranslatonHTML("dialog.Ok");
47
+        = APP.translation.generateTranslationHTML("dialog.Ok");
48
     var buttons = [];
48
     var buttons = [];
49
     buttons.push({title: buttonTxt, value: "ok"});
49
     buttons.push({title: buttonTxt, value: "ok"});
50
 
50
 
122
 
122
 
123
 function onXmppConnectionFailed(stropheErrorMsg) {
123
 function onXmppConnectionFailed(stropheErrorMsg) {
124
 
124
 
125
-    var title = APP.translation.generateTranslatonHTML(
125
+    var title = APP.translation.generateTranslationHTML(
126
         "dialog.error");
126
         "dialog.error");
127
 
127
 
128
     var message;
128
     var message;
129
     if (stropheErrorMsg) {
129
     if (stropheErrorMsg) {
130
-        message = APP.translation.generateTranslatonHTML(
130
+        message = APP.translation.generateTranslationHTML(
131
             "dialog.connectErrorWithMsg", {msg: stropheErrorMsg});
131
             "dialog.connectErrorWithMsg", {msg: stropheErrorMsg});
132
     } else {
132
     } else {
133
-        message = APP.translation.generateTranslatonHTML(
133
+        message = APP.translation.generateTranslationHTML(
134
             "dialog.connectError");
134
             "dialog.connectError");
135
     }
135
     }
136
 
136
 
211
         );
211
         );
212
     });
212
     });
213
     APP.xmpp.addListener(XMPPEvents.RESERVATION_ERROR, function (code, msg) {
213
     APP.xmpp.addListener(XMPPEvents.RESERVATION_ERROR, function (code, msg) {
214
-        var title = APP.translation.generateTranslatonHTML(
214
+        var title = APP.translation.generateTranslationHTML(
215
             "dialog.reservationError");
215
             "dialog.reservationError");
216
-        var message = APP.translation.generateTranslatonHTML(
216
+        var message = APP.translation.generateTranslationHTML(
217
             "dialog.reservationErrorMsg", {code: code, msg: msg});
217
             "dialog.reservationErrorMsg", {code: code, msg: msg});
218
         messageHandler.openDialog(
218
         messageHandler.openDialog(
219
             title,
219
             title,
232
     APP.xmpp.addListener(XMPPEvents.MUC_DESTROYED, function (reason) {
232
     APP.xmpp.addListener(XMPPEvents.MUC_DESTROYED, function (reason) {
233
         //FIXME: use Session Terminated from translation, but
233
         //FIXME: use Session Terminated from translation, but
234
         // 'reason' text comes from XMPP packet and is not translated
234
         // 'reason' text comes from XMPP packet and is not translated
235
-        var title = APP.translation.generateTranslatonHTML("dialog.sessTerminated");
235
+        var title = APP.translation.generateTranslationHTML("dialog.sessTerminated");
236
         messageHandler.openDialog(
236
         messageHandler.openDialog(
237
             title, reason, true, {},
237
             title, reason, true, {},
238
             function (event, value, message, formVals)
238
             function (event, value, message, formVals)
459
 
459
 
460
 function onMucJoined(jid, info) {
460
 function onMucJoined(jid, info) {
461
     Toolbar.updateRoomUrl(window.location.href);
461
     Toolbar.updateRoomUrl(window.location.href);
462
-    var meHTML = APP.translation.generateTranslatonHTML("me");
462
+    var meHTML = APP.translation.generateTranslationHTML("me");
463
     $("#localNick").html(Strophe.getResourceFromJid(jid) + " (" + meHTML + ")");
463
     $("#localNick").html(Strophe.getResourceFromJid(jid) + " (" + meHTML + ")");
464
 
464
 
465
     var settings = Settings.getSettings();
465
     var settings = Settings.getSettings();

+ 3
- 3
modules/UI/authentication/Authentication.js Переглянути файл

22
         var room = roomName.substr(0, roomName.indexOf('@'));
22
         var room = roomName.substr(0, roomName.indexOf('@'));
23
 
23
 
24
         var title
24
         var title
25
-            = APP.translation.generateTranslatonHTML("dialog.WaitingForHost");
25
+            = APP.translation.generateTranslationHTML("dialog.WaitingForHost");
26
         var msg
26
         var msg
27
-            = APP.translation.generateTranslatonHTML(
27
+            = APP.translation.generateTranslationHTML(
28
                     "dialog.WaitForHostMsg", {room: room});
28
                     "dialog.WaitForHostMsg", {room: room});
29
 
29
 
30
         var buttonTxt
30
         var buttonTxt
31
-            = APP.translation.generateTranslatonHTML("dialog.IamHost");
31
+            = APP.translation.generateTranslationHTML("dialog.IamHost");
32
         var buttons = [];
32
         var buttons = [];
33
         buttons.push({title: buttonTxt, value: "authNow"});
33
         buttons.push({title: buttonTxt, value: "authNow"});
34
 
34
 

+ 2
- 2
modules/UI/authentication/LoginDialog.js Переглянути файл

31
         'type="password" data-i18n="[placeholder]dialog.userPassword"' +
31
         'type="password" data-i18n="[placeholder]dialog.userPassword"' +
32
         ' placeholder="user password">';
32
         ' placeholder="user password">';
33
 
33
 
34
-    var okButton = APP.translation.generateTranslatonHTML("dialog.Ok");
34
+    var okButton = APP.translation.generateTranslationHTML("dialog.Ok");
35
 
35
 
36
-    var cancelButton = APP.translation.generateTranslatonHTML("dialog.Cancel");
36
+    var cancelButton = APP.translation.generateTranslationHTML("dialog.Cancel");
37
 
37
 
38
     var states = {
38
     var states = {
39
         login: {
39
         login: {

+ 5
- 5
modules/UI/prezi/Prezi.js Переглянути файл

58
             );
58
             );
59
         }
59
         }
60
         else {
60
         else {
61
-            var html = APP.translation.generateTranslatonHTML(
61
+            var html = APP.translation.generateTranslationHTML(
62
                 "dialog.sharePreziTitle");
62
                 "dialog.sharePreziTitle");
63
-            var cancelButton = APP.translation.generateTranslatonHTML(
63
+            var cancelButton = APP.translation.generateTranslationHTML(
64
                 "dialog.Cancel");
64
                 "dialog.Cancel");
65
-            var shareButton = APP.translation.generateTranslatonHTML(
65
+            var shareButton = APP.translation.generateTranslationHTML(
66
                 "dialog.Share");
66
                 "dialog.Share");
67
-            var backButton = APP.translation.generateTranslatonHTML(
67
+            var backButton = APP.translation.generateTranslationHTML(
68
                 "dialog.Back");
68
                 "dialog.Back");
69
             var buttons = [];
69
             var buttons = [];
70
             var buttons1 = [];
70
             var buttons1 = [];
75
             buttons.push({title: shareButton, value: true});
75
             buttons.push({title: shareButton, value: true});
76
             // Back button
76
             // Back button
77
             buttons1.push({title: backButton, value: true});
77
             buttons1.push({title: backButton, value: true});
78
-            var linkError = APP.translation.generateTranslatonHTML(
78
+            var linkError = APP.translation.generateTranslationHTML(
79
                 "dialog.preziLinkError");
79
                 "dialog.preziLinkError");
80
             var defaultUrl = APP.translation.translateString("defaultPreziLink",
80
             var defaultUrl = APP.translation.translateString("defaultPreziLink",
81
                 {url: "http://prezi.com/wz7vhjycl7e6/my-prezi"});
81
                 {url: "http://prezi.com/wz7vhjycl7e6/my-prezi"});

+ 9
- 9
modules/UI/toolbars/Toolbar.js Переглянути файл

101
 
101
 
102
     }
102
     }
103
 
103
 
104
-    var title = APP.translation.generateTranslatonHTML(
104
+    var title = APP.translation.generateTranslationHTML(
105
         "dialog.sessTerminated");
105
         "dialog.sessTerminated");
106
-    var msg = APP.translation.generateTranslatonHTML(
106
+    var msg = APP.translation.generateTranslationHTML(
107
         "dialog.hungUp");
107
         "dialog.hungUp");
108
-    var button = APP.translation.generateTranslatonHTML(
108
+    var button = APP.translation.generateTranslationHTML(
109
         "dialog.joinAgain");
109
         "dialog.joinAgain");
110
     var buttons = [];
110
     var buttons = [];
111
     buttons.push({title: button, value: true});
111
     buttons.push({title: button, value: true});
129
 
129
 
130
 function toggleRecording() {
130
 function toggleRecording() {
131
     APP.xmpp.toggleRecording(function (callback) {
131
     APP.xmpp.toggleRecording(function (callback) {
132
-        var msg = APP.translation.generateTranslatonHTML(
132
+        var msg = APP.translation.generateTranslationHTML(
133
             "dialog.recordingToken");
133
             "dialog.recordingToken");
134
         var token = APP.translation.translateString("dialog.token");
134
         var token = APP.translation.translateString("dialog.token");
135
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
135
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
234
     var defaultNumber
234
     var defaultNumber
235
         = config.defaultSipNumber ? config.defaultSipNumber : '';
235
         = config.defaultSipNumber ? config.defaultSipNumber : '';
236
 
236
 
237
-    var sipMsg = APP.translation.generateTranslatonHTML(
237
+    var sipMsg = APP.translation.generateTranslationHTML(
238
         "dialog.sipMsg");
238
         "dialog.sipMsg");
239
     messageHandler.openTwoButtonDialog(null, null, null,
239
     messageHandler.openTwoButtonDialog(null, null, null,
240
         '<h2>' + sipMsg + '</h2>' +
240
         '<h2>' + sipMsg + '</h2>' +
374
                         }
374
                         }
375
                     });
375
                     });
376
             } else {
376
             } else {
377
-                var msg = APP.translation.generateTranslatonHTML(
377
+                var msg = APP.translation.generateTranslationHTML(
378
                     "dialog.passwordMsg");
378
                     "dialog.passwordMsg");
379
                 var yourPassword = APP.translation.translateString(
379
                 var yourPassword = APP.translation.translateString(
380
                     "dialog.yourPassword");
380
                     "dialog.yourPassword");
444
      * FIXME: not used ?
444
      * FIXME: not used ?
445
      */
445
      */
446
     my.openSettingsDialog = function () {
446
     my.openSettingsDialog = function () {
447
-        var settings1 = APP.translation.generateTranslatonHTML(
447
+        var settings1 = APP.translation.generateTranslationHTML(
448
             "dialog.settings1");
448
             "dialog.settings1");
449
-        var settings2 = APP.translation.generateTranslatonHTML(
449
+        var settings2 = APP.translation.generateTranslationHTML(
450
             "dialog.settings2");
450
             "dialog.settings2");
451
-        var settings3 = APP.translation.generateTranslatonHTML(
451
+        var settings3 = APP.translation.generateTranslationHTML(
452
             "dialog.settings3");
452
             "dialog.settings3");
453
 
453
 
454
         var yourPassword = APP.translation.translateString(
454
         var yourPassword = APP.translation.translateString(

+ 6
- 6
modules/UI/util/MessageHandler.js Переглянути файл

11
         var title = null;
11
         var title = null;
12
         if(titleKey)
12
         if(titleKey)
13
         {
13
         {
14
-            title = APP.translation.generateTranslatonHTML(titleKey);
14
+            title = APP.translation.generateTranslationHTML(titleKey);
15
         }
15
         }
16
-        var message = APP.translation.generateTranslatonHTML(messageKey);
16
+        var message = APP.translation.generateTranslationHTML(messageKey);
17
         $.prompt(message,
17
         $.prompt(message,
18
             {
18
             {
19
                 title: title,
19
                 title: title,
43
     {
43
     {
44
         var buttons = [];
44
         var buttons = [];
45
 
45
 
46
-        var leftButton = APP.translation.generateTranslatonHTML(leftButtonKey);
46
+        var leftButton = APP.translation.generateTranslationHTML(leftButtonKey);
47
         buttons.push({ title: leftButton, value: true});
47
         buttons.push({ title: leftButton, value: true});
48
 
48
 
49
         var cancelButton
49
         var cancelButton
50
-            = APP.translation.generateTranslatonHTML("dialog.Cancel");
50
+            = APP.translation.generateTranslationHTML("dialog.Cancel");
51
         buttons.push({title: cancelButton, value: false});
51
         buttons.push({title: cancelButton, value: false});
52
 
52
 
53
         var message = msgString, title = titleString;
53
         var message = msgString, title = titleString;
54
         if (titleKey)
54
         if (titleKey)
55
         {
55
         {
56
-            title = APP.translation.generateTranslatonHTML(titleKey);
56
+            title = APP.translation.generateTranslationHTML(titleKey);
57
         }
57
         }
58
         if (msgKey) {
58
         if (msgKey) {
59
-            message = APP.translation.generateTranslatonHTML(msgKey);
59
+            message = APP.translation.generateTranslationHTML(msgKey);
60
         }
60
         }
61
         $.prompt(message, {
61
         $.prompt(message, {
62
             title: title,
62
             title: title,

+ 5
- 5
modules/UI/videolayout/LocalVideo.js Переглянути файл

46
     }
46
     }
47
 
47
 
48
     var nameSpan = $('#' + this.videoSpanId + '>span.displayname');
48
     var nameSpan = $('#' + this.videoSpanId + '>span.displayname');
49
-    var defaultLocalDisplayName = APP.translation.generateTranslatonHTML(
49
+    var defaultLocalDisplayName = APP.translation.generateTranslationHTML(
50
         interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
50
         interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
51
 
51
 
52
     // If we already have a display name for this video.
52
     // If we already have a display name for this video.
55
         if (nameSpan.text() !== displayName) {
55
         if (nameSpan.text() !== displayName) {
56
             if (displayName && displayName.length > 0)
56
             if (displayName && displayName.length > 0)
57
             {
57
             {
58
-                var meHTML = APP.translation.generateTranslatonHTML("me");
58
+                var meHTML = APP.translation.generateTranslationHTML("me");
59
                 $('#localDisplayName').html(displayName + ' (' + meHTML + ')');
59
                 $('#localDisplayName').html(displayName + ' (' + meHTML + ')');
60
             }
60
             }
61
             else
61
             else
70
 
70
 
71
 
71
 
72
         if (displayName && displayName.length > 0) {
72
         if (displayName && displayName.length > 0) {
73
-            var meHTML = APP.translation.generateTranslatonHTML("me");
73
+            var meHTML = APP.translation.generateTranslationHTML("me");
74
             nameSpan.innerHTML = displayName + meHTML;
74
             nameSpan.innerHTML = displayName + meHTML;
75
         }
75
         }
76
         else {
76
         else {
134
     if (!$('#localDisplayName').is(":visible")) {
134
     if (!$('#localDisplayName').is(":visible")) {
135
         if (NicknameHandler.getNickname())
135
         if (NicknameHandler.getNickname())
136
         {
136
         {
137
-            var meHTML = APP.translation.generateTranslatonHTML("me");
137
+            var meHTML = APP.translation.generateTranslationHTML("me");
138
             $('#localDisplayName').html(NicknameHandler.getNickname() + " (" + meHTML + ")");
138
             $('#localDisplayName').html(NicknameHandler.getNickname() + " (" + meHTML + ")");
139
         }
139
         }
140
         else
140
         else
141
         {
141
         {
142
-            var defaultHTML = APP.translation.generateTranslatonHTML(
142
+            var defaultHTML = APP.translation.generateTranslationHTML(
143
                 interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
143
                 interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
144
             $('#localDisplayName')
144
             $('#localDisplayName')
145
                 .html(defaultHTML);
145
                 .html(defaultHTML);

+ 1
- 1
modules/UI/videolayout/RemoteVideo.js Переглянути файл

347
         }
347
         }
348
         else if (key && key.length > 0)
348
         else if (key && key.length > 0)
349
         {
349
         {
350
-            var nameHtml = APP.translation.generateTranslatonHTML(key);
350
+            var nameHtml = APP.translation.generateTranslationHTML(key);
351
             $('#' + this.videoSpanId + '_name').html(nameHtml);
351
             $('#' + this.videoSpanId + '_name').html(nameHtml);
352
         }
352
         }
353
         else
353
         else

+ 1
- 1
modules/translation/translation.js Переглянути файл

122
     translateElement: function (selector) {
122
     translateElement: function (selector) {
123
         selector.i18n();
123
         selector.i18n();
124
     },
124
     },
125
-    generateTranslatonHTML: function (key, options) {
125
+    generateTranslationHTML: function (key, options) {
126
         var str = "<span data-i18n=\"" + key + "\"";
126
         var str = "<span data-i18n=\"" + key + "\"";
127
         if(options)
127
         if(options)
128
         {
128
         {

Завантаження…
Відмінити
Зберегти