Merge branch 'master' into fixes/2245-comment-thread-resolved-status

Author: jcansdale

.github/ISSUE_TEMPLATE/localization_suggestion.md

@@ -0,0 +1,45 @@
+---
+name: Localization suggestion
+about: Suggest an improvement to our localization
+labels: localization, bug
+title: 'Localization: '
+---
+<!-- Hello! Please read the [Contributing Guidelines](https://github.com/github/VisualStudio/blob/master/CONTRIBUTING.md) before submitting an issue regarding the GitHub Extension for Visual Studio. -->
+## Language
+<!-- Czech -->
+<!-- German -->
+<!-- Spanish -->
+<!-- French -->
+<!-- Italian -->
+<!-- Japanese -->
+<!-- Korean -->
+<!-- Polish -->
+<!-- Portuguese (Brazil) -->
+<!-- Russian -->
+<!-- Turkish -->
+<!-- Chinese (Simplified) -->
+<!-- Chinese (Traditional) -->
+
+## English source
+<!-- Translations are made from the English sources, please paste it here. -->
+```
+
+```
+
+## Original Translation
+<!-- Please paste the original translation here. -->
+```
+
+```
+
+## Screenshots
+<!-- Translations are sometimes provided by vendors that do not have access to the UI. Providing screenshots can give them a lot of context. -->
+
+## Notes
+<!-- If you can, please explain what is incorrect about the translation. -->
+
+## Suggested Translation
+<!-- If you can, please suggest an alternate translation. -->
+```
+
+```

README.md

@@ -19,7 +19,6 @@ Official builds of this extension are available at [the official website](https:
 
 [![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master)
 [![Build Status](https://github-editor-tools.visualstudio.com/VisualStudio/_apis/build/status/github.VisualStudio?branchName=master)](https://github-editor-tools.visualstudio.com/VisualStudio/_build/latest?definitionId=4&branchName=master)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/github-visual-studio/localized.svg)](https://crowdin.com/project/github-visual-studio)
 [![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio)
 
 [![Follow GitHub for Visual Studio](https://img.shields.io/twitter/follow/GitHubVS.svg?style=social "Follow GitHubVS")](https://twitter.com/githubvs?ref_src=twsrc%5Etfw) [![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github/VisualStudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

appveyor.yml

@@ -69,6 +69,7 @@ for:
   branches:
     only:
       - master
+      - /releases/(?:(?!-vsinstaller).)*?/
   environment:
     matrix:
       - BUILD_TYPE: package

crowdin.yml

@@ -59,13 +59,13 @@ Depends on #1993
                 new CommitListViewModel(
                     new CommitSummaryViewModel(new CommitModel
                     {
-                        Author = new ActorModel { Login = "grokys" },
+                        Author = new CommitActorModel { User = new ActorModel{ Login = "grokys" }},
                         AbbreviatedOid = "c7c7d25",
                         MessageHeadline = "Refactor comment view models."
                     }),
                     new CommitSummaryViewModel(new CommitModel
                     {
-                        Author = new ActorModel { Login = "shana" },
+                        Author = new CommitActorModel { User = new ActorModel{ Login = "shana" }},
                         AbbreviatedOid = "04e6a90",
                         MessageHeadline = "Refactor comment view models.",
                     })),

src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs

@@ -0,0 +1,19 @@
+using GitHub.Models;
+
+namespace GitHub.ViewModels
+{
+    public class CommitActorViewModel: ActorViewModel, ICommitActorViewModel
+    {
+        public CommitActorViewModel(CommitActorModel model)
+            :base(model.User)
+        {
+            Name = model.Name;
+            Email = model.Email;
+            HasLogin = model.User != null;
+        }
+
+        public string Email { get; }
+        public string Name { get; }
+        public bool HasLogin { get; }
+    }
+}

src/GitHub.App/ViewModels/CommitActorViewModel.cs

@@ -25,6 +25,7 @@ public CommitListViewModel(params ICommitSummaryViewModel[] commits)
 
             Commits = commits;
             Author = Commits[0].Author;
+            AuthorName = GetAuthorDisplayName(Commits[0].Author);
             AuthorCaption = BuildAuthorCaption();
         }
 
@@ -42,12 +43,16 @@ public CommitListViewModel(IEnumerable<ICommitSummaryViewModel> commits)
             }
 
             Author = Commits[0].Author;
+            AuthorName = GetAuthorDisplayName(Commits[0].Author);
             AuthorCaption = BuildAuthorCaption();
         }
 
         /// <inheritdoc/>
-        public IActorViewModel Author { get; }
+        public ICommitActorViewModel Author { get; }
 
+        /// <inheritdoc/>
+        public string AuthorName { get; }
+       
         /// <inheritdoc/>
         public string AuthorCaption { get; }
 
@@ -58,7 +63,7 @@ string BuildAuthorCaption()
         {
             var result = new StringBuilder();
 
-            if (Commits.Any(x => x.Author.Login != Author.Login))
+            if (Commits.Any(x => GetAuthorDisplayName(x.Author) != AuthorName))
             {
                 result.Append(Resources.AndOthers);
                 result.Append(' ');
@@ -67,5 +72,10 @@ string BuildAuthorCaption()
             result.Append(Resources.AddedSomeCommits);
             return result.ToString();
         }
+
+        string GetAuthorDisplayName(ICommitActorViewModel commitActorViewModel)
+        {
+            return commitActorViewModel.HasLogin ? commitActorViewModel.Login : commitActorViewModel.Name;
+        }
     }
 }

src/GitHub.App/ViewModels/Documents/CommitListViewModel.cs

@@ -14,7 +14,7 @@ public class CommitSummaryViewModel : ViewModelBase, ICommitSummaryViewModel
         public CommitSummaryViewModel(CommitModel commit)
         {
             AbbreviatedOid = commit.AbbreviatedOid;
-            Author = new ActorViewModel(commit.Author);
+            Author = new CommitActorViewModel(commit.Author);
             Header = commit.MessageHeadline;
             Oid = commit.Oid;
         }
@@ -23,7 +23,7 @@ public CommitSummaryViewModel(CommitModel commit)
         public string AbbreviatedOid { get; private set; }
 
         /// <inheritdoc/>
-        public IActorViewModel Author { get; private set; }
+        public ICommitActorViewModel Author { get; private set; }
 
         /// <inheritdoc/>
         public string Header { get; private set; }

src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs

@@ -31,7 +31,6 @@ public class RepositoryPublishViewModel : RepositoryFormViewModel, IRepositoryPu
         readonly IModelServiceFactory modelServiceFactory;
         readonly ObservableAsPropertyHelper<IReadOnlyList<IAccount>> accounts;
         readonly ObservableAsPropertyHelper<bool> isHostComboBoxVisible;
-        readonly ObservableAsPropertyHelper<string> title;
         readonly IUsageTracker usageTracker;
 
         [ImportingConstructor]
@@ -52,14 +51,6 @@ public RepositoryPublishViewModel(
             this.usageTracker = usageTracker;
             this.modelServiceFactory = modelServiceFactory;
 
-            title = this.WhenAny(
-                x => x.SelectedConnection,
-                x => x.Value != null ?
-                    string.Format(CultureInfo.CurrentCulture, Resources.PublishToTitle, x.Value.HostAddress.Title) :
-                    Resources.PublishTitle
-            )
-            .ToProperty(this, x => x.Title);
-
             Connections = connectionManager.Connections;
             this.repositoryPublishService = repositoryPublishService;
 
@@ -109,8 +100,6 @@ public RepositoryPublishViewModel(
                 });
         }
 
-        public string Title { get { return title.Value; } }
-
         public ReactiveCommand<Unit, ProgressState> PublishRepository { get; private set; }
         public IReadOnlyObservableCollection<IConnection> Connections { get; private set; }
 

src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs

@@ -11,7 +11,12 @@ public interface ICommitListViewModel : IViewModel
         /// <summary>
         /// Gets the first author of the commits in the list.
         /// </summary>
-        IActorViewModel Author { get; }
+        ICommitActorViewModel Author { get; }
+
+        /// <summary>
+        /// Gets a string to display the author login or the author name.
+        /// </summary>
+        string AuthorName { get; }
 
         /// <summary>
         /// Gets a string to display next to the author in the view.