Selaa lähdekoodia

Adds translation support for placeholder attributes.

master
hristoterezov 10 vuotta sitten
vanhempi
commit
1825f47ef2
5 muutettua tiedostoa jossa 25 lisäystä ja 8 poistoa
  1. 1
    1
      index.html
  2. 4
    1
      lang/main.json
  3. 10
    3
      libs/app.bundle.js
  4. 6
    2
      modules/UI/UI.js
  5. 4
    1
      modules/UI/toolbars/Toolbar.js

+ 1
- 1
index.html Näytä tiedosto

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

+ 4
- 1
lang/main.json Näytä tiedosto

178
         "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
178
         "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
179
         "Yes": "Yes",
179
         "Yes": "Yes",
180
         "reservationError": "Reservation system error",
180
         "reservationError": "Reservation system error",
181
-        "reservationErrorMsg": "Error code: __code__, message: __msg__"
181
+        "reservationErrorMsg": "Error code: __code__, message: __msg__",
182
+        "password": "password",
183
+        "userPassword": "user password",
184
+        "token": "token"
182
 
185
 
183
     }
186
     }
184
 }
187
 }

+ 10
- 3
libs/app.bundle.js Näytä tiedosto

1715
     message += APP.translation.translateString(
1715
     message += APP.translation.translateString(
1716
         "dialog.passwordRequired");
1716
         "dialog.passwordRequired");
1717
     message += '</h2>' +
1717
     message += '</h2>' +
1718
-        '<input id="lockKey" type="text" placeholder="password" autofocus>';
1718
+        '<input id="lockKey" type="text" data-i18n=' +
1719
+        '"[placeholder]dialog.password" placeholder="' +
1720
+        APP.translation.translateString("dialog.password") +
1721
+        '" autofocus>';
1719
 
1722
 
1720
     messageHandler.openTwoButtonDialog(null, null, null, message,
1723
     messageHandler.openTwoButtonDialog(null, null, null, message,
1721
         true,
1724
         true,
1881
         '<input id="passwordrequired.username" type="text" ' +
1884
         '<input id="passwordrequired.username" type="text" ' +
1882
         'placeholder="user@domain.net" autofocus>' +
1885
         'placeholder="user@domain.net" autofocus>' +
1883
         '<input id="passwordrequired.password" ' +
1886
         '<input id="passwordrequired.password" ' +
1884
-        'type="password" placeholder="user password">';
1887
+        'type="password" data-i18n="[placeholder]dialog.userPassword"' +
1888
+        ' placeholder="user password">';
1885
     UI.messageHandler.openTwoButtonDialog(null, null, null, message,
1889
     UI.messageHandler.openTwoButtonDialog(null, null, null, message,
1886
         true,
1890
         true,
1887
         "dialog.Ok",
1891
         "dialog.Ok",
4747
     APP.xmpp.toggleRecording(function (callback) {
4751
     APP.xmpp.toggleRecording(function (callback) {
4748
         var msg = APP.translation.generateTranslatonHTML(
4752
         var msg = APP.translation.generateTranslatonHTML(
4749
             "dialog.recordingToken");
4753
             "dialog.recordingToken");
4754
+        var token = APP.translation.translateString("dialog.token");
4750
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
4755
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
4751
                 '<h2>' + msg + '</h2>' +
4756
                 '<h2>' + msg + '</h2>' +
4752
                 '<input id="recordingToken" type="text" ' +
4757
                 '<input id="recordingToken" type="text" ' +
4753
-                'placeholder="token" autofocus>',
4758
+                ' data-i18n="[placeholder]dialog.token" ' +
4759
+                'placeholder="' + token + '" autofocus>',
4754
             false,
4760
             false,
4755
             "dialog.Save",
4761
             "dialog.Save",
4756
             function (e, v, m, f) {
4762
             function (e, v, m, f) {
5000
                 messageHandler.openTwoButtonDialog(null, null, null,
5006
                 messageHandler.openTwoButtonDialog(null, null, null,
5001
                     '<h2>' + msg + '</h2>' +
5007
                     '<h2>' + msg + '</h2>' +
5002
                         '<input id="lockKey" type="text"' +
5008
                         '<input id="lockKey" type="text"' +
5009
+                        ' data-i18n="[placeholder]dialog.yourPassword" ' +
5003
                         'placeholder="' + yourPassword + '" autofocus>',
5010
                         'placeholder="' + yourPassword + '" autofocus>',
5004
                     false,
5011
                     false,
5005
                     "dialog.Save",
5012
                     "dialog.Save",

+ 6
- 2
modules/UI/UI.js Näytä tiedosto

478
     message += APP.translation.translateString(
478
     message += APP.translation.translateString(
479
         "dialog.passwordRequired");
479
         "dialog.passwordRequired");
480
     message += '</h2>' +
480
     message += '</h2>' +
481
-        '<input id="lockKey" type="text" placeholder="password" autofocus>';
481
+        '<input id="lockKey" type="text" data-i18n=' +
482
+        '"[placeholder]dialog.password" placeholder="' +
483
+        APP.translation.translateString("dialog.password") +
484
+        '" autofocus>';
482
 
485
 
483
     messageHandler.openTwoButtonDialog(null, null, null, message,
486
     messageHandler.openTwoButtonDialog(null, null, null, message,
484
         true,
487
         true,
644
         '<input id="passwordrequired.username" type="text" ' +
647
         '<input id="passwordrequired.username" type="text" ' +
645
         'placeholder="user@domain.net" autofocus>' +
648
         'placeholder="user@domain.net" autofocus>' +
646
         '<input id="passwordrequired.password" ' +
649
         '<input id="passwordrequired.password" ' +
647
-        'type="password" placeholder="user password">';
650
+        'type="password" data-i18n="[placeholder]dialog.userPassword"' +
651
+        ' placeholder="user password">';
648
     UI.messageHandler.openTwoButtonDialog(null, null, null, message,
652
     UI.messageHandler.openTwoButtonDialog(null, null, null, message,
649
         true,
653
         true,
650
         "dialog.Ok",
654
         "dialog.Ok",

+ 4
- 1
modules/UI/toolbars/Toolbar.js Näytä tiedosto

128
     APP.xmpp.toggleRecording(function (callback) {
128
     APP.xmpp.toggleRecording(function (callback) {
129
         var msg = APP.translation.generateTranslatonHTML(
129
         var msg = APP.translation.generateTranslatonHTML(
130
             "dialog.recordingToken");
130
             "dialog.recordingToken");
131
+        var token = APP.translation.translateString("dialog.token");
131
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
132
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
132
                 '<h2>' + msg + '</h2>' +
133
                 '<h2>' + msg + '</h2>' +
133
                 '<input id="recordingToken" type="text" ' +
134
                 '<input id="recordingToken" type="text" ' +
134
-                'placeholder="token" autofocus>',
135
+                ' data-i18n="[placeholder]dialog.token" ' +
136
+                'placeholder="' + token + '" autofocus>',
135
             false,
137
             false,
136
             "dialog.Save",
138
             "dialog.Save",
137
             function (e, v, m, f) {
139
             function (e, v, m, f) {
381
                 messageHandler.openTwoButtonDialog(null, null, null,
383
                 messageHandler.openTwoButtonDialog(null, null, null,
382
                     '<h2>' + msg + '</h2>' +
384
                     '<h2>' + msg + '</h2>' +
383
                         '<input id="lockKey" type="text"' +
385
                         '<input id="lockKey" type="text"' +
386
+                        ' data-i18n="[placeholder]dialog.yourPassword" ' +
384
                         'placeholder="' + yourPassword + '" autofocus>',
387
                         'placeholder="' + yourPassword + '" autofocus>',
385
                     false,
388
                     false,
386
                     "dialog.Save",
389
                     "dialog.Save",

Loading…
Peruuta
Tallenna