Adds translation support for placeholder attributes.

This commit is contained in:
hristoterezov 2015-03-04 12:59:52 +02:00
parent 169d613ac4
commit 1825f47ef2
5 changed files with 25 additions and 8 deletions

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=25"></script> <script src="libs/app.bundle.js?v=26"></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">

View File

@ -178,7 +178,10 @@
"gracefulShutdown": "Our service is currently down for maintenance. Please try again later.", "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
"Yes": "Yes", "Yes": "Yes",
"reservationError": "Reservation system error", "reservationError": "Reservation system error",
"reservationErrorMsg": "Error code: __code__, message: __msg__" "reservationErrorMsg": "Error code: __code__, message: __msg__",
"password": "password",
"userPassword": "user password",
"token": "token"
} }
} }

View File

@ -1715,7 +1715,10 @@ function onPasswordReqiured(callback) {
message += APP.translation.translateString( message += APP.translation.translateString(
"dialog.passwordRequired"); "dialog.passwordRequired");
message += '</h2>' + message += '</h2>' +
'<input id="lockKey" type="text" placeholder="password" autofocus>'; '<input id="lockKey" type="text" data-i18n=' +
'"[placeholder]dialog.password" placeholder="' +
APP.translation.translateString("dialog.password") +
'" autofocus>';
messageHandler.openTwoButtonDialog(null, null, null, message, messageHandler.openTwoButtonDialog(null, null, null, message,
true, true,
@ -1881,7 +1884,8 @@ UI.showLoginPopup = function(callback)
'<input id="passwordrequired.username" type="text" ' + '<input id="passwordrequired.username" type="text" ' +
'placeholder="user@domain.net" autofocus>' + 'placeholder="user@domain.net" autofocus>' +
'<input id="passwordrequired.password" ' + '<input id="passwordrequired.password" ' +
'type="password" placeholder="user password">'; 'type="password" data-i18n="[placeholder]dialog.userPassword"' +
' placeholder="user password">';
UI.messageHandler.openTwoButtonDialog(null, null, null, message, UI.messageHandler.openTwoButtonDialog(null, null, null, message,
true, true,
"dialog.Ok", "dialog.Ok",
@ -4747,10 +4751,12 @@ function toggleRecording() {
APP.xmpp.toggleRecording(function (callback) { APP.xmpp.toggleRecording(function (callback) {
var msg = APP.translation.generateTranslatonHTML( var msg = APP.translation.generateTranslatonHTML(
"dialog.recordingToken"); "dialog.recordingToken");
var token = APP.translation.translateString("dialog.token");
APP.UI.messageHandler.openTwoButtonDialog(null, null, null, APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
'<h2>' + msg + '</h2>' + '<h2>' + msg + '</h2>' +
'<input id="recordingToken" type="text" ' + '<input id="recordingToken" type="text" ' +
'placeholder="token" autofocus>', ' data-i18n="[placeholder]dialog.token" ' +
'placeholder="' + token + '" autofocus>',
false, false,
"dialog.Save", "dialog.Save",
function (e, v, m, f) { function (e, v, m, f) {
@ -5000,6 +5006,7 @@ var Toolbar = (function (my) {
messageHandler.openTwoButtonDialog(null, null, null, messageHandler.openTwoButtonDialog(null, null, null,
'<h2>' + msg + '</h2>' + '<h2>' + msg + '</h2>' +
'<input id="lockKey" type="text"' + '<input id="lockKey" type="text"' +
' data-i18n="[placeholder]dialog.yourPassword" ' +
'placeholder="' + yourPassword + '" autofocus>', 'placeholder="' + yourPassword + '" autofocus>',
false, false,
"dialog.Save", "dialog.Save",

View File

@ -478,7 +478,10 @@ function onPasswordReqiured(callback) {
message += APP.translation.translateString( message += APP.translation.translateString(
"dialog.passwordRequired"); "dialog.passwordRequired");
message += '</h2>' + message += '</h2>' +
'<input id="lockKey" type="text" placeholder="password" autofocus>'; '<input id="lockKey" type="text" data-i18n=' +
'"[placeholder]dialog.password" placeholder="' +
APP.translation.translateString("dialog.password") +
'" autofocus>';
messageHandler.openTwoButtonDialog(null, null, null, message, messageHandler.openTwoButtonDialog(null, null, null, message,
true, true,
@ -644,7 +647,8 @@ UI.showLoginPopup = function(callback)
'<input id="passwordrequired.username" type="text" ' + '<input id="passwordrequired.username" type="text" ' +
'placeholder="user@domain.net" autofocus>' + 'placeholder="user@domain.net" autofocus>' +
'<input id="passwordrequired.password" ' + '<input id="passwordrequired.password" ' +
'type="password" placeholder="user password">'; 'type="password" data-i18n="[placeholder]dialog.userPassword"' +
' placeholder="user password">';
UI.messageHandler.openTwoButtonDialog(null, null, null, message, UI.messageHandler.openTwoButtonDialog(null, null, null, message,
true, true,
"dialog.Ok", "dialog.Ok",

View File

@ -128,10 +128,12 @@ function toggleRecording() {
APP.xmpp.toggleRecording(function (callback) { APP.xmpp.toggleRecording(function (callback) {
var msg = APP.translation.generateTranslatonHTML( var msg = APP.translation.generateTranslatonHTML(
"dialog.recordingToken"); "dialog.recordingToken");
var token = APP.translation.translateString("dialog.token");
APP.UI.messageHandler.openTwoButtonDialog(null, null, null, APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
'<h2>' + msg + '</h2>' + '<h2>' + msg + '</h2>' +
'<input id="recordingToken" type="text" ' + '<input id="recordingToken" type="text" ' +
'placeholder="token" autofocus>', ' data-i18n="[placeholder]dialog.token" ' +
'placeholder="' + token + '" autofocus>',
false, false,
"dialog.Save", "dialog.Save",
function (e, v, m, f) { function (e, v, m, f) {
@ -381,6 +383,7 @@ var Toolbar = (function (my) {
messageHandler.openTwoButtonDialog(null, null, null, messageHandler.openTwoButtonDialog(null, null, null,
'<h2>' + msg + '</h2>' + '<h2>' + msg + '</h2>' +
'<input id="lockKey" type="text"' + '<input id="lockKey" type="text"' +
' data-i18n="[placeholder]dialog.yourPassword" ' +
'placeholder="' + yourPassword + '" autofocus>', 'placeholder="' + yourPassword + '" autofocus>',
false, false,
"dialog.Save", "dialog.Save",