frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge branch '0.19' of github.com:node-red/node-red into 0.19

Browse Source
This commit is contained in:
Nick O'Leary 2018-06-25 13:55:21 +01:00
commit fa09c7c8b2
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/js/ui/notifications.js
View File

@ -96,7 +96,7 @@ RED.notifications = (function() {
if (options.buttons) { if (options.buttons) {
var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(n) var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(n)
options.buttons.forEach(function(buttonDef) { options.buttons.forEach(function(buttonDef) {
var b = $('<button>').text(buttonDef.text).click(buttonDef.click).appendTo(buttonSet); var b = $('<button>').html(buttonDef.text).click(buttonDef.click).appendTo(buttonSet);
if (buttonDef.id) { if (buttonDef.id) {
b.attr('id',buttonDef.id); b.attr('id',buttonDef.id);
} }

2
editor/js/ui/projects/projects.js
View File

@ -1983,7 +1983,7 @@ RED.projects = (function() {
notification.close(); notification.close();
} }
},{ },{
text: $('<span><i class="fa fa-refresh"></i> Retry</span>'), text: '<span><i class="fa fa-refresh"></i> ' +RED._("projects.send-req.retry") +'</span>',
click: function() { click: function() {
body = body || {}; body = body || {};
var authBody = {}; var authBody = {};

1
red/api/editor/locales/en-US/editor.json
View File

@ -795,6 +795,7 @@
"username": "Username", "username": "Username",
"password": "Password", "password": "Password",
"passphrase": "Passphrase", "passphrase": "Passphrase",
"retry": "Retry",
"update-failed": "Failed to update auth", "update-failed": "Failed to update auth",
"unhandled": "Unhandled error response" "unhandled": "Unhandled error response"
}, },

1
red/api/editor/locales/ja/editor.json
View File

@ -785,6 +785,7 @@
"username": "ユーザ名", "username": "ユーザ名",
"password": "パスワード", "password": "パスワード",
"passphrase": "パスフレーズ", "passphrase": "パスフレーズ",
"retry": "リトライ",
"update-failed": "認証の更新に失敗しました", "update-failed": "認証の更新に失敗しました",
"unhandled": "エラー応答が処理されませんでした" "unhandled": "エラー応答が処理されませんでした"
}, },

2
test/editor/pageobjects/workspace/debugTab_page.js
View File

@ -15,7 +15,7 @@
**/ **/
function open() { function open() {
browser.clickWithWait('#red-ui-tab-debug'); browser.clickWithWait('#red-ui-tab-debug-link-button');
} }
function getMessage(index) { function getMessage(index) {