Procházet zdrojové kódy

Adds translation support for placeholder attributes.

master
hristoterezov před 10 roky
rodič
revize
1825f47ef2
5 změnil soubory, kde provedl 25 přidání a 8 odebrání
  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 Zobrazit soubor

@@ -19,7 +19,7 @@
19 19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
20 20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
21 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 23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
24 24
     <link rel="stylesheet" href="css/font.css?v=6"/>
25 25
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 4
- 1
lang/main.json Zobrazit soubor

@@ -178,7 +178,10 @@
178 178
         "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
179 179
         "Yes": "Yes",
180 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 Zobrazit soubor

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

+ 6
- 2
modules/UI/UI.js Zobrazit soubor

@@ -478,7 +478,10 @@ function onPasswordReqiured(callback) {
478 478
     message += APP.translation.translateString(
479 479
         "dialog.passwordRequired");
480 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 486
     messageHandler.openTwoButtonDialog(null, null, null, message,
484 487
         true,
@@ -644,7 +647,8 @@ UI.showLoginPopup = function(callback)
644 647
         '<input id="passwordrequired.username" type="text" ' +
645 648
         'placeholder="user@domain.net" autofocus>' +
646 649
         '<input id="passwordrequired.password" ' +
647
-        'type="password" placeholder="user password">';
650
+        'type="password" data-i18n="[placeholder]dialog.userPassword"' +
651
+        ' placeholder="user password">';
648 652
     UI.messageHandler.openTwoButtonDialog(null, null, null, message,
649 653
         true,
650 654
         "dialog.Ok",

+ 4
- 1
modules/UI/toolbars/Toolbar.js Zobrazit soubor

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

Načítá se…
Zrušit
Uložit