Merge pull request #276 from github-for-unity/fixes/british-favourite

shana · web-flow · commit d7c8f683329f · 2017-09-08T17:45:58.000+01:00
Changing "favour" to "favor"
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -126,52 +126,52 @@ public List<GitBranch> RemoteBranches
     }
 
     [Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)]
-    sealed class Favourites : ScriptObjectSingleton<Favourites>
+    sealed class Favorites : ScriptObjectSingleton<Favorites>
     {
-        [SerializeField] private List<string> favouriteBranches;
-        public List<string> FavouriteBranches
+        [SerializeField] private List<string> favoriteBranches;
+        public List<string> FavoriteBranches
         {
             get
             {
-                if (favouriteBranches == null)
-                    FavouriteBranches = new List<string>();
-                return favouriteBranches;
+                if (favoriteBranches == null)
+                    FavoriteBranches = new List<string>();
+                return favoriteBranches;
             }
             set
             {
-                favouriteBranches = value;
+                favoriteBranches = value;
                 Save(true);
             }
         }
 
-        public void SetFavourite(string branchName)
+        public void SetFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
+            if (FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Add(branchName);
+            FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public void UnsetFavourite(string branchName)
+        public void UnsetFavorite(string branchName)
         {
-            if (!FavouriteBranches.Contains(branchName))
+            if (!FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Remove(branchName);
+            FavoriteBranches.Remove(branchName);
             Save(true);
         }
 
-        public void ToggleFavourite(string branchName)
+        public void ToggleFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
-                FavouriteBranches.Remove(branchName);
+            if (FavoriteBranches.Contains(branchName))
+                FavoriteBranches.Remove(branchName);
             else
-                FavouriteBranches.Add(branchName);
+                FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public bool IsFavourite(string branchName)
+        public bool IsFavorite(string branchName)
         {
-            return FavouriteBranches.Contains(branchName);
+            return FavoriteBranches.Contains(branchName);
         }
     }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
@@ -84,8 +84,8 @@ class Styles
         private static Texture2D branchIcon,
                                  activeBranchIcon,
                                  trackingBranchIcon,
-                                 favouriteIconOn,
-                                 favouriteIconOff,
+                                 favoriteIconOn,
+                                 favoriteIconOff,
                                  smallLogoIcon,
                                  bigLogoIcon,
                                  defaultAssetIcon,
@@ -663,29 +663,29 @@ public static Texture2D TrackingBranchIcon
             }
         }
 
-        public static Texture2D FavouriteIconOn
+        public static Texture2D FavoriteIconOn
         {
             get
             {
-                if (favouriteIconOn == null)
+                if (favoriteIconOn == null)
                 {
-                    favouriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");
+                    favoriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");
                 }
 
-                return favouriteIconOn;
+                return favoriteIconOn;
             }
         }
 
-        public static Texture2D FavouriteIconOff
+        public static Texture2D FavoriteIconOff
         {
             get
             {
-                if (favouriteIconOff == null)
+                if (favoriteIconOff == null)
                 {
-                    favouriteIconOff = FolderIcon;
+                    favoriteIconOff = FolderIcon;
                 }
 
-                return favouriteIconOff;
+                return favoriteIconOff;
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -38,12 +38,12 @@ class BranchesView : Subview
         private bool showLocalBranches = true;
         private bool showRemoteBranches = true;
 
-        [NonSerialized] private List<BranchTreeNode> favourites = new List<BranchTreeNode>();
+        [NonSerialized] private List<BranchTreeNode> favorites = new List<BranchTreeNode>();
         [NonSerialized] private int listID = -1;
         [NonSerialized] private List<GitBranch> newLocalBranches;
         [NonSerialized] private BranchTreeNode newNodeSelection;
         [NonSerialized] private BranchesMode targetMode;
-        [NonSerialized] private bool favouritesHasChanged;
+        [NonSerialized] private bool favoritesHasChanged;
 
         [SerializeField] private BranchTreeNode activeBranchNode;
         [SerializeField] private BranchTreeNode localRoot;
@@ -52,7 +52,7 @@ class BranchesView : Subview
         [SerializeField] private List<Remote> remotes = new List<Remote>();
         [SerializeField] private Vector2 scroll;
         [SerializeField] private BranchTreeNode selectedNode;
-        private List<string> favouritesList;
+        private List<string> favoritesList;
 
         public override void InitializeView(IView parent)
         {
@@ -64,7 +64,7 @@ public override void OnEnable()
         {
             base.OnEnable();
             AttachHandlers(Repository);
-            favouritesHasChanged = true;
+            favoritesHasChanged = true;
         }
 
         public override void OnDisable()
@@ -81,10 +81,10 @@ public override void OnDataUpdate()
 
         private void MaybeUpdateData()
         {
-            if (favouritesHasChanged)
+            if (favoritesHasChanged)
             {
-                favouritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
-                favouritesHasChanged = false;
+                favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
+                favoritesHasChanged = false;
             }
         }
 
@@ -160,17 +160,17 @@ public void OnEmbeddedGUI()
 
                 GUILayout.BeginVertical(Styles.CommitFileAreaStyle);
                 {
-                    // Favourites list
-                    if (favourites.Count > 0)
+                    // Favorites list
+                    if (favorites.Count > 0)
                     {
                         GUILayout.Label(FavoritesTitle);
                         GUILayout.BeginHorizontal();
                         {
                             GUILayout.BeginVertical();
                             {
-                                for (var index = 0; index < favourites.Count; ++index)
+                                for (var index = 0; index < favorites.Count; ++index)
                                 {
-                                    OnTreeNodeGUI(favourites[index]);
+                                    OnTreeNodeGUI(favorites[index]);
                                 }
                             }
 
@@ -264,12 +264,12 @@ public void OnEmbeddedGUI()
 
         private int CompareBranches(GitBranch a, GitBranch b)
         {
-            if (IsFavourite(a.Name))
+            if (IsFavorite(a.Name))
             {
                 return -1;
             }
 
-            if (IsFavourite(b.Name))
+            if (IsFavorite(b.Name))
             {
                 return 1;
             }
@@ -287,9 +287,9 @@ private int CompareBranches(GitBranch a, GitBranch b)
             return 0;
         }
 
-        private bool IsFavourite(string branchName)
+        private bool IsFavorite(string branchName)
         {
-            return !String.IsNullOrEmpty(branchName) && favouritesList.Contains(branchName);
+            return !String.IsNullOrEmpty(branchName) && favoritesList.Contains(branchName);
         }
 
         private void OnLocalBranchesUpdate(IEnumerable<GitBranch> list)
@@ -318,8 +318,8 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
             var tracking = new List<KeyValuePair<int, int>>();
             var localBranchNodes = new List<BranchTreeNode>();
 
-            // Prepare for updated favourites listing
-            favourites.Clear();
+            // Prepare for updated favorites listing
+            favorites.Clear();
 
             // Just build directly on the local root, keep track of active branch
             localRoot = new BranchTreeNode("", NodeType.Folder, false);
@@ -348,10 +348,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                     }
                 }
 
-                // Add to favourites
-                if (favouritesList.Contains(branch.Name))
+                // Add to favorites
+                if (favoritesList.Contains(branch.Name))
                 {
-                    favourites.Add(node);
+                    favorites.Add(node);
                 }
 
                 // Build into tree
@@ -392,10 +392,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                     }
                 }
 
-                // Add to favourites
-                if (favouritesList.Contains(branch.Name))
+                // Add to favorites
+                if (favoritesList.Contains(branch.Name))
                 {
-                    favourites.Add(node);
+                    favorites.Add(node);
                 }
 
                 // Build on the root of the remote, just like with locals
@@ -430,23 +430,23 @@ private void BuildTree(BranchTreeNode parent, BranchTreeNode child)
             BuildTree(folder, child);
         }
 
-        private void SetFavourite(BranchTreeNode branch, bool favourite)
+        private void SetFavorite(BranchTreeNode branch, bool favorite)
         {
             if (string.IsNullOrEmpty(branch.Name))
             {
                 return;
             }
 
-            if (!favourite)
+            if (!favorite)
             {
-                favourites.Remove(branch);
-                Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());
+                favorites.Remove(branch);
+                Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
             }
             else
             {
-                favourites.Remove(branch);
-                favourites.Add(branch);
-                Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());
+                favorites.Remove(branch);
+                favorites.Add(branch);
+                Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
             }
         }
 
@@ -589,12 +589,12 @@ private void OnTreeNodeGUI(BranchTreeNode node)
             var style = node.Active ? Styles.BoldLabel : Styles.Label;
             var rect = GUILayoutUtility.GetRect(content, style, GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));
             var clickRect = new Rect(0f, rect.y, Position.width, rect.height);
-            var favouriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);
+            var favoriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);
 
             var selected = selectedNode == node;
             var keyboardFocus = GUIUtility.keyboardControl == listID;
 
-            // Selection highlight and favourite toggle
+            // Selection highlight and favorite toggle
             if (selected)
             {
                 if (Event.current.type == EventType.Repaint)
@@ -604,22 +604,22 @@ private void OnTreeNodeGUI(BranchTreeNode node)
 
                 if (node.Type != NodeType.Folder)
                 {
-                    var favourite = IsFavourite(node.Name);
+                    var favorite = IsFavorite(node.Name);
                     if (Event.current.type == EventType.Repaint)
                     {
-                        GUI.DrawTexture(favouriteRect, favourite ? Styles.FavouriteIconOn : Styles.FavouriteIconOff);
+                        GUI.DrawTexture(favoriteRect, favorite ? Styles.FavoriteIconOn : Styles.FavoriteIconOff);
                     }
-                    else if (Event.current.type == EventType.MouseDown && favouriteRect.Contains(Event.current.mousePosition))
+                    else if (Event.current.type == EventType.MouseDown && favoriteRect.Contains(Event.current.mousePosition))
                     {
-                        SetFavourite(node, !favourite);
+                        SetFavorite(node, !favorite);
                         Event.current.Use();
                     }
                 }
             }
-            // Favourite status
-            else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavourite(node.Name))
+            // Favorite status
+            else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavorite(node.Name))
             {
-                GUI.DrawTexture(favouriteRect, Styles.FavouriteIconOn);
+                GUI.DrawTexture(favoriteRect, Styles.FavoriteIconOn);
             }
 
             // The actual icon and label

Original file line number	Diff line number	Diff line change
`@@ -126,52 +126,52 @@ public List<GitBranch> RemoteBranches`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`[Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)]`
`129`		`- sealed class Favourites : ScriptObjectSingleton<Favourites>`
	`129`	`+ sealed class Favorites : ScriptObjectSingleton<Favorites>`
`130`	`130`	`{`
`131`		`- [SerializeField] private List<string> favouriteBranches;`
`132`		`- public List<string> FavouriteBranches`
	`131`	`+ [SerializeField] private List<string> favoriteBranches;`
	`132`	`+ public List<string> FavoriteBranches`
`133`	`133`	`{`
`134`	`134`	`get`
`135`	`135`	`{`
`136`		`- if (favouriteBranches == null)`
`137`		`- FavouriteBranches = new List<string>();`
`138`		`- return favouriteBranches;`
	`136`	`+ if (favoriteBranches == null)`
	`137`	`+ FavoriteBranches = new List<string>();`
	`138`	`+ return favoriteBranches;`
`139`	`139`	`}`
`140`	`140`	`set`
`141`	`141`	`{`
`142`		`- favouriteBranches = value;`
	`142`	`+ favoriteBranches = value;`
`143`	`143`	`Save(true);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`- public void SetFavourite(string branchName)`
	`147`	`+ public void SetFavorite(string branchName)`
`148`	`148`	`{`
`149`		`- if (FavouriteBranches.Contains(branchName))`
	`149`	`+ if (FavoriteBranches.Contains(branchName))`
`150`	`150`	`return;`
`151`		`- FavouriteBranches.Add(branchName);`
	`151`	`+ FavoriteBranches.Add(branchName);`
`152`	`152`	`Save(true);`
`153`	`153`	`}`
`154`	`154`
`155`		`- public void UnsetFavourite(string branchName)`
	`155`	`+ public void UnsetFavorite(string branchName)`
`156`	`156`	`{`
`157`		`- if (!FavouriteBranches.Contains(branchName))`
	`157`	`+ if (!FavoriteBranches.Contains(branchName))`
`158`	`158`	`return;`
`159`		`- FavouriteBranches.Remove(branchName);`
	`159`	`+ FavoriteBranches.Remove(branchName);`
`160`	`160`	`Save(true);`
`161`	`161`	`}`
`162`	`162`
`163`		`- public void ToggleFavourite(string branchName)`
	`163`	`+ public void ToggleFavorite(string branchName)`
`164`	`164`	`{`
`165`		`- if (FavouriteBranches.Contains(branchName))`
`166`		`- FavouriteBranches.Remove(branchName);`
	`165`	`+ if (FavoriteBranches.Contains(branchName))`
	`166`	`+ FavoriteBranches.Remove(branchName);`
`167`	`167`	`else`
`168`		`- FavouriteBranches.Add(branchName);`
	`168`	`+ FavoriteBranches.Add(branchName);`
`169`	`169`	`Save(true);`
`170`	`170`	`}`
`171`	`171`
`172`		`- public bool IsFavourite(string branchName)`
	`172`	`+ public bool IsFavorite(string branchName)`
`173`	`173`	`{`
`174`		`- return FavouriteBranches.Contains(branchName);`
	`174`	`+ return FavoriteBranches.Contains(branchName);`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ class Styles`
`84`	`84`	`private static Texture2D branchIcon,`
`85`	`85`	`activeBranchIcon,`
`86`	`86`	`trackingBranchIcon,`
`87`		`- favouriteIconOn,`
`88`		`- favouriteIconOff,`
	`87`	`+ favoriteIconOn,`
	`88`	`+ favoriteIconOff,`
`89`	`89`	`smallLogoIcon,`
`90`	`90`	`bigLogoIcon,`
`91`	`91`	`defaultAssetIcon,`
`@@ -663,29 +663,29 @@ public static Texture2D TrackingBranchIcon`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`
`666`		`- public static Texture2D FavouriteIconOn`
	`666`	`+ public static Texture2D FavoriteIconOn`
`667`	`667`	`{`
`668`	`668`	`get`
`669`	`669`	`{`
`670`		`- if (favouriteIconOn == null)`
	`670`	`+ if (favoriteIconOn == null)`
`671`	`671`	`{`
`672`		`- favouriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");`
	`672`	`+ favoriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");`
`673`	`673`	`}`
`674`	`674`
`675`		`- return favouriteIconOn;`
	`675`	`+ return favoriteIconOn;`
`676`	`676`	`}`
`677`	`677`	`}`
`678`	`678`
`679`		`- public static Texture2D FavouriteIconOff`
	`679`	`+ public static Texture2D FavoriteIconOff`
`680`	`680`	`{`
`681`	`681`	`get`
`682`	`682`	`{`
`683`		`- if (favouriteIconOff == null)`
	`683`	`+ if (favoriteIconOff == null)`
`684`	`684`	`{`
`685`		`- favouriteIconOff = FolderIcon;`
	`685`	`+ favoriteIconOff = FolderIcon;`
`686`	`686`	`}`
`687`	`687`
`688`		`- return favouriteIconOff;`
	`688`	`+ return favoriteIconOff;`
`689`	`689`	`}`
`690`	`690`	`}`
`691`	`691`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ class BranchesView : Subview`
`38`	`38`	`private bool showLocalBranches = true;`
`39`	`39`	`private bool showRemoteBranches = true;`
`40`	`40`
`41`		`- [NonSerialized] private List<BranchTreeNode> favourites = new List<BranchTreeNode>();`
	`41`	`+ [NonSerialized] private List<BranchTreeNode> favorites = new List<BranchTreeNode>();`
`42`	`42`	`[NonSerialized] private int listID = -1;`
`43`	`43`	`[NonSerialized] private List<GitBranch> newLocalBranches;`
`44`	`44`	`[NonSerialized] private BranchTreeNode newNodeSelection;`
`45`	`45`	`[NonSerialized] private BranchesMode targetMode;`
`46`		`- [NonSerialized] private bool favouritesHasChanged;`
	`46`	`+ [NonSerialized] private bool favoritesHasChanged;`
`47`	`47`
`48`	`48`	`[SerializeField] private BranchTreeNode activeBranchNode;`
`49`	`49`	`[SerializeField] private BranchTreeNode localRoot;`
`@@ -52,7 +52,7 @@ class BranchesView : Subview`
`52`	`52`	`[SerializeField] private List<Remote> remotes = new List<Remote>();`
`53`	`53`	`[SerializeField] private Vector2 scroll;`
`54`	`54`	`[SerializeField] private BranchTreeNode selectedNode;`
`55`		`- private List<string> favouritesList;`
	`55`	`+ private List<string> favoritesList;`
`56`	`56`
`57`	`57`	`public override void InitializeView(IView parent)`
`58`	`58`	`{`
`@@ -64,7 +64,7 @@ public override void OnEnable()`
`64`	`64`	`{`
`65`	`65`	`base.OnEnable();`
`66`	`66`	`AttachHandlers(Repository);`
`67`		`- favouritesHasChanged = true;`
	`67`	`+ favoritesHasChanged = true;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public override void OnDisable()`
`@@ -81,10 +81,10 @@ public override void OnDataUpdate()`
`81`	`81`
`82`	`82`	`private void MaybeUpdateData()`
`83`	`83`	`{`
`84`		`- if (favouritesHasChanged)`
	`84`	`+ if (favoritesHasChanged)`
`85`	`85`	`{`
`86`		`- favouritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());`
`87`		`- favouritesHasChanged = false;`
	`86`	`+ favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());`
	`87`	`+ favoritesHasChanged = false;`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -160,17 +160,17 @@ public void OnEmbeddedGUI()`
`160`	`160`
`161`	`161`	`GUILayout.BeginVertical(Styles.CommitFileAreaStyle);`
`162`	`162`	`{`
`163`		`- // Favourites list`
`164`		`- if (favourites.Count > 0)`
	`163`	`+ // Favorites list`
	`164`	`+ if (favorites.Count > 0)`
`165`	`165`	`{`
`166`	`166`	`GUILayout.Label(FavoritesTitle);`
`167`	`167`	`GUILayout.BeginHorizontal();`
`168`	`168`	`{`
`169`	`169`	`GUILayout.BeginVertical();`
`170`	`170`	`{`
`171`		`- for (var index = 0; index < favourites.Count; ++index)`
	`171`	`+ for (var index = 0; index < favorites.Count; ++index)`
`172`	`172`	`{`
`173`		`- OnTreeNodeGUI(favourites[index]);`
	`173`	`+ OnTreeNodeGUI(favorites[index]);`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`@@ -264,12 +264,12 @@ public void OnEmbeddedGUI()`
`264`	`264`
`265`	`265`	`private int CompareBranches(GitBranch a, GitBranch b)`
`266`	`266`	`{`
`267`		`- if (IsFavourite(a.Name))`
	`267`	`+ if (IsFavorite(a.Name))`
`268`	`268`	`{`
`269`	`269`	`return -1;`
`270`	`270`	`}`
`271`	`271`
`272`		`- if (IsFavourite(b.Name))`
	`272`	`+ if (IsFavorite(b.Name))`
`273`	`273`	`{`
`274`	`274`	`return 1;`
`275`	`275`	`}`
`@@ -287,9 +287,9 @@ private int CompareBranches(GitBranch a, GitBranch b)`
`287`	`287`	`return 0;`
`288`	`288`	`}`
`289`	`289`
`290`		`- private bool IsFavourite(string branchName)`
	`290`	`+ private bool IsFavorite(string branchName)`
`291`	`291`	`{`
`292`		`- return !String.IsNullOrEmpty(branchName) && favouritesList.Contains(branchName);`
	`292`	`+ return !String.IsNullOrEmpty(branchName) && favoritesList.Contains(branchName);`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`private void OnLocalBranchesUpdate(IEnumerable<GitBranch> list)`
`@@ -318,8 +318,8 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo`
`318`	`318`	`var tracking = new List<KeyValuePair<int, int>>();`
`319`	`319`	`var localBranchNodes = new List<BranchTreeNode>();`
`320`	`320`
`321`		`- // Prepare for updated favourites listing`
`322`		`- favourites.Clear();`
	`321`	`+ // Prepare for updated favorites listing`
	`322`	`+ favorites.Clear();`
`323`	`323`
`324`	`324`	`// Just build directly on the local root, keep track of active branch`
`325`	`325`	`localRoot = new BranchTreeNode("", NodeType.Folder, false);`
`@@ -348,10 +348,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
`351`		`- // Add to favourites`
`352`		`- if (favouritesList.Contains(branch.Name))`
	`351`	`+ // Add to favorites`
	`352`	`+ if (favoritesList.Contains(branch.Name))`
`353`	`353`	`{`
`354`		`- favourites.Add(node);`
	`354`	`+ favorites.Add(node);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`// Build into tree`
`@@ -392,10 +392,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`
`395`		`- // Add to favourites`
`396`		`- if (favouritesList.Contains(branch.Name))`
	`395`	`+ // Add to favorites`
	`396`	`+ if (favoritesList.Contains(branch.Name))`
`397`	`397`	`{`
`398`		`- favourites.Add(node);`
	`398`	`+ favorites.Add(node);`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`// Build on the root of the remote, just like with locals`
`@@ -430,23 +430,23 @@ private void BuildTree(BranchTreeNode parent, BranchTreeNode child)`
`430`	`430`	`BuildTree(folder, child);`
`431`	`431`	`}`
`432`	`432`
`433`		`- private void SetFavourite(BranchTreeNode branch, bool favourite)`
	`433`	`+ private void SetFavorite(BranchTreeNode branch, bool favorite)`
`434`	`434`	`{`
`435`	`435`	`if (string.IsNullOrEmpty(branch.Name))`
`436`	`436`	`{`
`437`	`437`	`return;`
`438`	`438`	`}`
`439`	`439`
`440`		`- if (!favourite)`
	`440`	`+ if (!favorite)`
`441`	`441`	`{`
`442`		`- favourites.Remove(branch);`
`443`		`- Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());`
	`442`	`+ favorites.Remove(branch);`
	`443`	`+ Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());`
`444`	`444`	`}`
`445`	`445`	`else`
`446`	`446`	`{`
`447`		`- favourites.Remove(branch);`
`448`		`- favourites.Add(branch);`
`449`		`- Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());`
	`447`	`+ favorites.Remove(branch);`
	`448`	`+ favorites.Add(branch);`
	`449`	`+ Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`
`@@ -589,12 +589,12 @@ private void OnTreeNodeGUI(BranchTreeNode node)`
`589`	`589`	`var style = node.Active ? Styles.BoldLabel : Styles.Label;`
`590`	`590`	`var rect = GUILayoutUtility.GetRect(content, style, GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));`
`591`	`591`	`var clickRect = new Rect(0f, rect.y, Position.width, rect.height);`
`592`		`- var favouriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);`
	`592`	`+ var favoriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);`
`593`	`593`
`594`	`594`	`var selected = selectedNode == node;`
`595`	`595`	`var keyboardFocus = GUIUtility.keyboardControl == listID;`
`596`	`596`
`597`		`- // Selection highlight and favourite toggle`
	`597`	`+ // Selection highlight and favorite toggle`
`598`	`598`	`if (selected)`
`599`	`599`	`{`
`600`	`600`	`if (Event.current.type == EventType.Repaint)`
`@@ -604,22 +604,22 @@ private void OnTreeNodeGUI(BranchTreeNode node)`
`604`	`604`
`605`	`605`	`if (node.Type != NodeType.Folder)`
`606`	`606`	`{`
`607`		`- var favourite = IsFavourite(node.Name);`
	`607`	`+ var favorite = IsFavorite(node.Name);`
`608`	`608`	`if (Event.current.type == EventType.Repaint)`
`609`	`609`	`{`
`610`		`- GUI.DrawTexture(favouriteRect, favourite ? Styles.FavouriteIconOn : Styles.FavouriteIconOff);`
	`610`	`+ GUI.DrawTexture(favoriteRect, favorite ? Styles.FavoriteIconOn : Styles.FavoriteIconOff);`
`611`	`611`	`}`
`612`		`- else if (Event.current.type == EventType.MouseDown && favouriteRect.Contains(Event.current.mousePosition))`
	`612`	`+ else if (Event.current.type == EventType.MouseDown && favoriteRect.Contains(Event.current.mousePosition))`
`613`	`613`	`{`
`614`		`- SetFavourite(node, !favourite);`
	`614`	`+ SetFavorite(node, !favorite);`
`615`	`615`	`Event.current.Use();`
`616`	`616`	`}`
`617`	`617`	`}`
`618`	`618`	`}`
`619`		`- // Favourite status`
`620`		`- else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavourite(node.Name))`
	`619`	`+ // Favorite status`
	`620`	`+ else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavorite(node.Name))`
`621`	`621`	`{`
`622`		`- GUI.DrawTexture(favouriteRect, Styles.FavouriteIconOn);`
	`622`	`+ GUI.DrawTexture(favoriteRect, Styles.FavoriteIconOn);`
`623`	`623`	`}`
`624`	`624`
`625`	`625`	`// The actual icon and label`