From b0c693cc3ad0bdb6f90cf018eee260f947818210 Mon Sep 17 00:00:00 2001 From: Kazuki-Nakanishi Date: Mon, 28 May 2018 17:06:38 +0900 Subject: [PATCH] move comment from json to js --- editor/js/ui/projects/tab-versionControl.js | 1 + red/api/editor/locales/en-US/editor.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js index c5db3f251..ee8cb98f4 100644 --- a/editor/js/ui/projects/tab-versionControl.js +++ b/editor/js/ui/projects/tab-versionControl.js @@ -897,6 +897,7 @@ RED.sidebar.versionControl = (function() { }, 400: { 'git_push_failed': function(err) { + // TODO: better message RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error"); }, 'unexpected_error': function(error) { diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index 01905db93..34e527c19 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -495,7 +495,7 @@ "createRemoteBranchPlaceholder": "Find or create a remote branch", "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.", "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.", - "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", // TODO: better message + "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", "push": "push", "pull": "pull", "unablePull": "

Unable to pull remote changes; your unstaged local changes would be overwritten.

Commit your changes and try again.

",