Merge pull request #72 from github-for-unity/fixes/dialog-ok

Changing Cancel buttons to Ok
github-for-unity · Jul 3, 2017 · 9eff271 · 9eff271
2 parents 96a63c7 + 7d1f1c5
commit 9eff271
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -612,7 +612,7 @@ private void OnTreeNodeGUI(BranchTreeNode node)
                                 {
                                     EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
                                         String.Format(Localization.SwitchBranchFailedDescription, node.Name),
-                                    Localization.Cancel);
+                                    Localization.Ok);
                                 }
                             }).Start();
                     }
@@ -627,7 +627,7 @@ private void OnTreeNodeGUI(BranchTreeNode node)
                                 {
                                     EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
                                         String.Format(Localization.SwitchBranchFailedDescription, node.Name),
-                                    Localization.Cancel);
+                                    Localization.Ok);
                                 }
                             }).Start();
                     }

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -679,7 +679,7 @@ private void Pull()
                         {
                             EditorUtility.DisplayDialog(Localization.PullActionTitle,
                                 Localization.PullFailureDescription,
-                            Localization.Cancel);
+                            Localization.Ok);
                         }
                     })
                     .Start();
@@ -702,7 +702,7 @@ private void Push()
                     {
                         EditorUtility.DisplayDialog(Localization.PushActionTitle,
                             Localization.PushFailureDescription,
-                        Localization.Cancel);
+                        Localization.Ok);
                     }
                 })
                 .Start();