Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 8e8136e

Browse files
Merge branch 'fixes/action-bar-push-button' into features/lock-files-view
2 parents c057d99 + 4ec3c39 commit 8e8136e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/GitHub.Api/Localization.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@
181181
<value>Pull</value>
182182
</data>
183183
<data name="PullButtonCount" xml:space="preserve">
184-
<value />
184+
<value>Pull ({0})</value>
185185
</data>
186186
<data name="PushButton" xml:space="preserve">
187187
<value>Push</value>
188188
</data>
189189
<data name="PushButtonCount" xml:space="preserve">
190-
<value />
190+
<value>Push ({0})</value>
191191
</data>
192192
<data name="PullConfirmTitle" xml:space="preserve">
193193
<value>Pull Changes?</value>

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ private void DoActionbarGUI()
509509
EditorGUI.EndDisabledGroup();
510510

511511
// Push button
512-
EditorGUI.BeginDisabledGroup(currentRemoteName == null || statusBehind != 0);
512+
EditorGUI.BeginDisabledGroup(currentRemoteName == null || statusAhead == 0);
513513
{
514514
var pushButtonText = statusAhead > 0 ? String.Format(Localization.PushButtonCount, statusAhead) : Localization.PushButton;
515515
var pushClicked = GUILayout.Button(pushButtonText, Styles.ToolbarButtonStyle);

0 commit comments

Comments
 (0)